merge of 691f0a578002a1d669bfbee72d4a577ba19f5509
authorJustin Patrin <papercrane@gmail.com>
Mon, 22 Aug 2005 20:50:44 +0000 (20:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 20:50:44 +0000 (20:50 +0000)
     and c456324f80138ac3564996d0741d738f1fafa406


Trivial merge