Merge branch 'master' of git+ssh://busybox.net/var/lib/git/busybox
authorDenys Vlasenko <vda.linux@googlemail.com>
Thu, 14 Jun 2012 15:30:04 +0000 (17:30 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Thu, 14 Jun 2012 15:30:04 +0000 (17:30 +0200)

Trivial merge