merge of 2c7a585a04594ec0d49d170b8fd07f7eaaf33875
authorJustin Patrin <papercrane@gmail.com>
Thu, 25 Aug 2005 17:21:51 +0000 (17:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 17:21:51 +0000 (17:21 +0000)
     and 509d6e16b96b95f3eee23c9d533dd87c708b8d4a


Trivial merge