merge of 6c892a12e5ecbf776b1486325e3502f44bfbee00
authorMichael Lauer <mickey@vanille-media.de>
Fri, 26 May 2006 12:56:04 +0000 (12:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 12:56:04 +0000 (12:56 +0000)
     and a28eb0331581874fd47b01b78e86dc73b0c99fcd


Trivial merge