merge of 002a1f51b953da649d96ae8ecdac59ea1ae42bd5
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Jul 2005 08:51:29 +0000 (08:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 08:51:29 +0000 (08:51 +0000)
     and cb61d6d8553483e78997e002c35cf2ce0ea17763


Trivial merge