merge of 2669117ead966ed1a52946f4b039a239cfd06607
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Jul 2006 17:09:45 +0000 (17:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 17:09:45 +0000 (17:09 +0000)
     and 4fe87eebac509c58687cf710c3f2394ab2805dbd


Trivial merge