merge of 02169d766c8620f531bb081faa58a6d1c2277f1e
authorMichael Lauer <mickey@vanille-media.de>
Wed, 21 Jun 2006 10:52:29 +0000 (10:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 10:52:29 +0000 (10:52 +0000)
     and 0638b16efb00651727ae22ae7f39bc1e65dc46de


Trivial merge