merge of 8a2023ca2f97d50fba9ee9d052e5353b46eda98f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Fri, 7 Jul 2006 10:20:51 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Jul 2006 10:20:51 +0000 (10:20 +0000)
     and ca2a10421cd90e75a5f22530f259d62b15f51929


Trivial merge