merge of 11d8497b1833de1683f037417535cc4ba64608f3
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Jul 2006 21:27:34 +0000 (21:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 21:27:34 +0000 (21:27 +0000)
     and 85921202b8fd4be54741cadc9cbf9c3768a9b23a


Trivial merge