Merge branch '2010-05-15-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 21 May 2010 18:30:28 +0000 (20:30 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Fri, 21 May 2010 18:30:28 +0000 (20:30 +0200)

Trivial merge