merge of 095485c13d43cfd2d416d2dd5827fd20d2f21c51
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 24 Apr 2006 15:53:25 +0000 (15:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 15:53:25 +0000 (15:53 +0000)
commita18c8697e25f8730f20e6687a6628640e6d9ab65
treee2d37e7df98e661a2d9a839bee92841254f5274f
parentf721d04e039ac91fd0d2b4a9b5fe7e56a8f91965
parent4ac36708f90c516e32b34725aeb81c2f3dfefd29
merge of 095485c13d43cfd2d416d2dd5827fd20d2f21c51
     and f0f7c07492861973e86b3e409efdcb411a4fd09e