merge of 462f9eb4321f7a407e426cef0645184c6c47894f
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Apr 2006 22:21:51 +0000 (22:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:21:51 +0000 (22:21 +0000)
     and b2211f892717fa37d3998804bc003413e17e1393


Trivial merge