merge of 35b40bf4117bf5bebe985df8f8d329cddaccfbbb
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Apr 2006 16:32:10 +0000 (16:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 16:32:10 +0000 (16:32 +0000)
     and 85b50b96aeb7153c7b2bfcb474d8cde63a470737


Trivial merge