merge of b24e9b02520ed2fe3a20db83419ea19b2d18e951
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 16 May 2006 10:05:34 +0000 (10:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 10:05:34 +0000 (10:05 +0000)
     and dac9c8eeceebb1b6b50179ead5fa288d4c1f99bc


Trivial merge