merge of 0c68cd9f7176bca16daf6bc374bbe0adcb6f7736
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 28 Jun 2006 15:11:34 +0000 (15:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 15:11:34 +0000 (15:11 +0000)
     and 9e7bb196edb79eecad7d7ed9e5be82a0489356f6


Trivial merge