merge of 4bd9a63f8807f4b1963f6fc396e9807603315627
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 2 Sep 2005 11:17:08 +0000 (11:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 11:17:08 +0000 (11:17 +0000)
     and b144329bc02b11109562f08443c2ce7a241f9d1f


Trivial merge