merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 22:16:39 +0000 (22:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 22:16:39 +0000 (22:16 +0000)
     and 9792e719eb583975723dd832d438c9d79abef870


Trivial merge