merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
authorJustin Patrin <papercrane@gmail.com>
Wed, 7 Sep 2005 23:26:21 +0000 (23:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 23:26:21 +0000 (23:26 +0000)
     and a1e17a5d7e46806b4e9ec3ded69b419eed479b4d


Trivial merge