merge of 3b10fe494db6e5e5f14deab8ed3c5865826faf0f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Thu, 6 Jul 2006 15:22:50 +0000 (15:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 15:22:50 +0000 (15:22 +0000)
     and 4c2c6d22cb72d6e2519963d42f2086588b362b2d


Trivial merge