Merge remote-tracking branch 'ms/fake-uname'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 12:50:55 +0000 (13:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 12:50:55 +0000 (13:50 +0100)
commitda7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5
tree2725a07a9e92e6e96e1431e633215d5f325479c0
parent4c3656d99deb897a6571fa82da2502df991a657e
parentf13d4e0b09e9aa8f8a47b402438848deaf5a26d1
Merge remote-tracking branch 'ms/fake-uname'

Conflicts:
lfs/fake-environ