merge of 5c8caead42a2c879d5b9eb133d13144c60bf2346
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 1 Aug 2005 09:36:46 +0000 (09:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 09:36:46 +0000 (09:36 +0000)
     and a96923affa3cadfa761e2f0338e3437cd3788b9b


Trivial merge