Merge branch 'popt-versoin-update' of git://git.busybox.net/~nkukard/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 5 Aug 2009 11:48:52 +0000 (13:48 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 5 Aug 2009 11:48:52 +0000 (13:48 +0200)

Trivial merge