merge of 8f015baa662d192e99b12916d23d852bce98af04
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 00:15:59 +0000 (00:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 00:15:59 +0000 (00:15 +0000)
     and 9f0eb94a2ab5c33776fdb1e56a08737557f04e1a


Trivial merge