merge of 7312b6306cd878588176ce2cc0a31e4d0edc4e5a
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 Jun 2006 17:04:56 +0000 (17:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Jun 2006 17:04:56 +0000 (17:04 +0000)
     and ba21f1faf99a465ffb1326139936cb5b957c10b3


Trivial merge