Merge branch 'master' of ssh://buildroot.net/var/lib/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Sat, 17 Dec 2011 16:38:21 +0000 (17:38 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 17 Dec 2011 16:38:21 +0000 (17:38 +0100)

Trivial merge