merge of 0e9d72f51e2b65b5d2ccc5321b4872af899180c6
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Jun 2006 08:17:46 +0000 (08:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 08:17:46 +0000 (08:17 +0000)
     and c5acd74e482d1e7de50bea58a79d8784225f2e5e


Trivial merge