merge of 3bce23b65aa15f7e7004b8d10ea82415547c11d6
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 15:16:21 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 15:16:21 +0000 (15:16 +0000)
     and 79101cb27f895ead25974ab455fb7cbbcb030caa


Trivial merge