merge of d0c5b7c949900a094e2ea11d85707b56997e2c91
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Jul 2006 20:37:42 +0000 (20:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Jul 2006 20:37:42 +0000 (20:37 +0000)
     and e4222200ae643006a3cbf7b68e35883321c05949


Trivial merge