merge of c1c5f45706391426e8869790b447469783a6e15d
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 13:16:09 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 13:16:09 +0000 (13:16 +0000)
     and dac5598f960dc940e35412e5c4235baf09f4afbf


Trivial merge