merge of 6cf43463f8980c4949a1dea852d710d362f18ac8
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 16 May 2006 10:17:00 +0000 (10:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 10:17:00 +0000 (10:17 +0000)
     and 9f92ed9e480dd6c278e18dd0d9f913f2917fae19


Trivial merge