merge of 086eccbfe2f48acd3f73977b451e8ce001884b98
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Apr 2006 21:45:44 +0000 (21:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:45:44 +0000 (21:45 +0000)
     and c202b2641db39b482c615f965d40d02caa42c5c5


Trivial merge