Merge branch 'for-2010.08' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 25 Aug 2010 12:49:17 +0000 (14:49 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 25 Aug 2010 12:49:17 +0000 (14:49 +0200)

Trivial merge