merge of 3014ab1948f135a7e8d1a7a6104675132403752d
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 16:16:06 +0000 (16:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 16:16:06 +0000 (16:16 +0000)
     and ca142ce9ae4b3c4535d5ed6d23aed2559ef91c6b


Trivial merge