Merge branch 'master' of git+ssh://busybox.net/var/lib/git/busybox
authorDenys Vlasenko <vda.linux@googlemail.com>
Mon, 21 Nov 2011 13:25:15 +0000 (14:25 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Mon, 21 Nov 2011 13:25:15 +0000 (14:25 +0100)

Trivial merge