Merge branch 'rpm-update3' of git://git.busybox.net/~nkukard/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Mon, 18 Jan 2010 11:34:02 +0000 (12:34 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Mon, 18 Jan 2010 11:34:02 +0000 (12:34 +0100)

Trivial merge