merge of 034e3efa6ef57ca55cebbeeb39b7546ae1454e36
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 2 Aug 2005 16:42:36 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 16:42:36 +0000 (16:42 +0000)
     and 4283ff06b5f924e60463c8d1814b4a3ace429898


Trivial merge