From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 Dec 2011 12:50:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'ms/fake-uname'
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5

Merge remote-tracking branch 'ms/fake-uname'

Conflicts:
	lfs/fake-environ
---

da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5