merge of 0484063486563010f0662099c9c6084d75e9a806
authorMichael Lauer <mickey@vanille-media.de>
Thu, 30 Jun 2005 19:31:26 +0000 (19:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Jun 2005 19:31:26 +0000 (19:31 +0000)
     and 3ecad514c5b23dc2516ed2bb95995f476a1075ac


Trivial merge