Merge remote-tracking branch 'ms/fake-uname' into next
authorroot <root@panda.(none)>
Sun, 18 Dec 2011 15:04:55 +0000 (16:04 +0100)
committerroot <root@panda.(none)>
Sun, 18 Dec 2011 15:04:55 +0000 (16:04 +0100)

Trivial merge