merge of 05f59d0250f45dd58a55c7c2c2889b58d28951ef
authorJustin Patrin <papercrane@gmail.com>
Sat, 14 Jan 2006 05:51:47 +0000 (05:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 05:51:47 +0000 (05:51 +0000)
     and 46041f133cbc74bb45da74974398099f4df06233


Trivial merge