Merge branch 'matchbox-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 1 Jul 2009 18:12:47 +0000 (20:12 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 1 Jul 2009 18:12:47 +0000 (20:12 +0200)

Trivial merge