merge of 44956d593fd4538bf972ccf1c800c55fc6155982
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 5 Jul 2005 15:00:57 +0000 (15:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 5 Jul 2005 15:00:57 +0000 (15:00 +0000)
     and 6a2d27de7343d2b00b2f4422f97e85a010f1868a


Trivial merge