merge of c251cce67b945ec4058e85c1e9a492c346fb51f3
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 10 May 2006 20:07:46 +0000 (20:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 20:07:46 +0000 (20:07 +0000)
     and e9d9eeb04f51b32dc71e4c98438e6880915a44da


Trivial merge