merge of 21858366d3f1cd69225dc0db2af6109cdd227145
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 18:50:58 +0000 (18:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 18:50:58 +0000 (18:50 +0000)
     and caff9d7758bbac1a8819824a3d56cef092f94ca8


Trivial merge