merge of 3fe026a130277946b2552c28c3fdda5e9bd74b31
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 May 2006 11:00:18 +0000 (11:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 11:00:18 +0000 (11:00 +0000)
     and d295f271af118b6b44395ca3e2c23eba55f3fa69


Trivial merge