merge of 7fa1e5c6dd75c098cabd0b1240a46de4c4a174ab
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Apr 2006 22:19:59 +0000 (22:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:19:59 +0000 (22:19 +0000)
     and ab41e679a9bfc6bc2294e34b63fd70a9ef105ead


Trivial merge