merge of 0b9bb46b4ffce99f3d0837a600f782e9b6d3f7c7
authorMichael Lauer <mickey@vanille-media.de>
Sun, 7 May 2006 15:32:12 +0000 (15:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 May 2006 15:32:12 +0000 (15:32 +0000)
     and f6fc6c0ebee5822d2cbdcfb0fb774d61b184af56


Trivial merge