merge of 9c951cf8a21c82b4eabd9def7e39018b72a58207
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Sat, 1 Jul 2006 17:39:27 +0000 (17:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Jul 2006 17:39:27 +0000 (17:39 +0000)
     and d50b000eb72487fd8f053761eb15160cf5e56976


Trivial merge