Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox
authorDenys Vlasenko <vda.linux@googlemail.com>
Fri, 21 Jan 2011 20:59:26 +0000 (21:59 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Fri, 21 Jan 2011 20:59:26 +0000 (21:59 +0100)

Trivial merge