merge of 8ea955d88bde7e28f0fa1895a44821e4806806fa
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 28 Jul 2005 14:44:28 +0000 (14:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:44:28 +0000 (14:44 +0000)
     and f73e4aeedb4ebe0d689215f48346e9c098e2adea


Trivial merge