merge of 492a286523344c6075a8e8afbb49f5b13be91738
authorMichael Lauer <mickey@vanille-media.de>
Sat, 22 Apr 2006 16:00:51 +0000 (16:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Apr 2006 16:00:51 +0000 (16:00 +0000)
     and d68918ea3df82803fb2bfefa0cbbdac04811caa7


Trivial merge