Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox
authorDenys Vlasenko <vda.linux@googlemail.com>
Sat, 19 Jun 2010 15:50:44 +0000 (17:50 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sat, 19 Jun 2010 15:50:44 +0000 (17:50 +0200)

Trivial merge