merge of 7f8e96e82814721e7ae8b59c9afa5c0a9084d7d7
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 15 Nov 2005 19:08:31 +0000 (19:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 19:08:31 +0000 (19:08 +0000)
     and e22e7c7ff9ab06d30951d9048b867b089b9185ea


Trivial merge