merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc
authorMichael Lauer <mickey@vanille-media.de>
Thu, 1 Jun 2006 22:52:43 +0000 (22:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Jun 2006 22:52:43 +0000 (22:52 +0000)
     and cc55c113a93ff0cca026956716e79f0fecb52ad2


Trivial merge