Merge branch 'website' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 21 May 2010 19:08:43 +0000 (21:08 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Fri, 21 May 2010 19:08:43 +0000 (21:08 +0200)

Trivial merge