merge of 32d700ed29f263f43a84f4a55a5cead4c12d033f
authorMichael Lauer <mickey@vanille-media.de>
Tue, 6 Jun 2006 21:06:31 +0000 (21:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Jun 2006 21:06:31 +0000 (21:06 +0000)
     and ad154a8528a3434623dd460bc473c8f854d9ed45


Trivial merge