merge of 8b8120727862804deb9f2a39e3783ab361641903
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 30 Jul 2005 21:00:58 +0000 (21:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 21:00:58 +0000 (21:00 +0000)
     and a20db40eaf050a3896e2642e9b129605dc631d4c


Trivial merge