merge of 4719404458019fa92365a0f97202f5d145c24ff6
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Oct 2005 08:12:42 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Oct 2005 08:12:42 +0000 (08:12 +0000)
     and 4a4dd989a03481d3137cc5c427bffabb4c7f99b6


Trivial merge