merge of d5c1c82a4f4d4259c9ae9a22865774bf9df663ca
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 30 Jul 2005 20:46:24 +0000 (20:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 20:46:24 +0000 (20:46 +0000)
     and e8a8ea202059d2f8a7a8f6d316818ee71b449d4a


Trivial merge