merge of 30cb3036d3a6a06d185c6a941ab380be44868897
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 10:29:25 +0000 (10:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 10:29:25 +0000 (10:29 +0000)
     and f53aad80b477af19e98c6b4ac4cc29e7b0277338


Trivial merge