merge of 94b564900cca12eafeb635e5e42858918f06d86a
authorMichael Lauer <mickey@vanille-media.de>
Fri, 7 Apr 2006 17:22:40 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Apr 2006 17:22:40 +0000 (17:22 +0000)
     and c0c009a85be5cd4c4c3057c6ce86f866920ca8b9


Trivial merge