merge of 2ff27dc2432bb6df1bec19deafdff91dbb72f2c9
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 13:08:20 +0000 (13:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 13:08:20 +0000 (13:08 +0000)
     and 540e74d92c3ae03760fd0c13786f2dc1fcd4d838


Trivial merge