merge of 0999703813e827e2010766c4f16c850b72e85f01
authorMichael Lauer <mickey@vanille-media.de>
Sun, 25 Sep 2005 00:57:58 +0000 (00:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Sep 2005 00:57:58 +0000 (00:57 +0000)
     and 6c47e659bdc5f5f73c5abe5b762e5ba029bb05bf


Trivial merge