merge of 24bf9da058274d3f063eefc91fd48d60cb1b6e0f
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jan 2006 15:38:36 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 15:38:36 +0000 (15:38 +0000)
     and 7ec5f433ed2baee7bf3ff7b6f5e7bcc764aba699


Trivial merge