Merge branch 'for-2010.08-3' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Mon, 30 Aug 2010 21:34:21 +0000 (23:34 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Mon, 30 Aug 2010 21:34:21 +0000 (23:34 +0200)

Trivial merge