merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:29:40 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:29:40 +0000 (21:29 +0000)
     and 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7


Trivial merge