merge of 4ae75badc5589c35fd33c90369b77e8d0a4d0c46
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Jul 2006 12:53:16 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 12:53:16 +0000 (12:53 +0000)
     and b2d6befb14a575e840b80779b3ee9e578a4bb3ce


Trivial merge