merge of 655180ca822fd77b58f585a3b13300acdaedb1cb
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jan 2006 19:53:30 +0000 (19:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 19:53:30 +0000 (19:53 +0000)
     and b6b0df140fe53ce37d902d8cc41a838a4abc1b7b


Trivial merge