merge of 9fe7545090478631299ff1907786e70a22cd02fb
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 17:15:33 +0000 (17:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 17:15:33 +0000 (17:15 +0000)
     and e59d303c0766acafb5e1569f3c7b8c61d2515b57


Trivial merge