merge of 0e0901aeb2df666b7ef411c84571c64d8648f2f7
authorMichael Lauer <mickey@vanille-media.de>
Sat, 9 Jul 2005 12:25:15 +0000 (12:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 12:25:15 +0000 (12:25 +0000)
     and 37b3bd1d7cf4c3ff2c0e00c6bd7a87d690fc63d5


Trivial merge