merge of 857d29a477b23e8bc2f6523391fe6bbcb15cf15a
authorMichael Lauer <mickey@vanille-media.de>
Wed, 28 Jun 2006 19:34:00 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 19:34:00 +0000 (19:34 +0000)
     and 89e400b6f42a60c37056051e437ba68603f0727f


Trivial merge