merge of 84ac7904b3e5b86a16d2ba1acac2d5a0876f3af4
authorMichael Lauer <mickey@vanille-media.de>
Tue, 18 Apr 2006 08:12:52 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Apr 2006 08:12:52 +0000 (08:12 +0000)
     and d45556cc21173533cecace2eefbf3115a7563e06


Trivial merge