merge of 30eebf6ff01f422b7202f44394c4cd74a659e235
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 May 2006 19:17:24 +0000 (19:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 19:17:24 +0000 (19:17 +0000)
     and aaa38d713385c71e081266891f9d3775789db3a1


Trivial merge