merge of 2b7e98de2ae7babc1fba7bf05e9cd56e79bd2aa3
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 May 2006 21:13:54 +0000 (21:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 21:13:54 +0000 (21:13 +0000)
     and b8059643b9bf29e34eaa1ca3277803350bd390bc


Trivial merge