merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44
authorJustin Patrin <papercrane@gmail.com>
Fri, 20 Jan 2006 06:07:28 +0000 (06:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 20 Jan 2006 06:07:28 +0000 (06:07 +0000)
     and cccbd67a0ede7ae4d1db1f9c45f544ed28d0b294


Trivial merge