merge of 830a2ca2c9484467078002caaef98f80db84c191
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 10:37:45 +0000 (10:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 10:37:45 +0000 (10:37 +0000)
     and a5073c2c09ef06e7875d4a30ddfdb0a9b8bd58f3


Trivial merge