merge of 67d2c7e1bf087c7c007705c24cae5ff93bd007be
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Sep 2005 14:37:27 +0000 (14:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 14:37:27 +0000 (14:37 +0000)
     and fbd660b279924b2d0ef656f652497ca4a3fd3787


Trivial merge