merge of 21480fa49602b411bc6fdfc765c8e6d9f6a34421
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 2 Sep 2005 11:13:48 +0000 (11:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 11:13:48 +0000 (11:13 +0000)
     and a40d3f0b70850c02cc511e028e68c5642d06494d


Trivial merge