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)
commit2e955b45d99552699cded33d990df885fe6dc94b
tree859da0785dc8b8cb89755ffa58bc4d6fd77dc75f
parentaa687cf2e951d1598ee7bc2f61678f311b083857
parent2d3bd5ce8118f6f2df55b08268c5871f38013f12
merge of 8ea955d88bde7e28f0fa1895a44821e4806806fa
     and f73e4aeedb4ebe0d689215f48346e9c098e2adea