Merge branch 'master' of git://git.buildroot.net/~correa/git/buildroot into test
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 8 May 2009 10:03:07 +0000 (12:03 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Fri, 8 May 2009 10:03:07 +0000 (12:03 +0200)

Trivial merge