merge of 2fd623e8d76c78b3918a5881b42ffab1609a05d0
authorMichael Lauer <mickey@vanille-media.de>
Tue, 21 Mar 2006 00:16:38 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Mar 2006 00:16:38 +0000 (00:16 +0000)
     and d6ae2145fa0116f5eb9376594a80f8bf63c64b86


Trivial merge