merge of 7bdc9a56f17551347d3b0b1a957cdb1e1429e3ba
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 4 Jul 2006 14:14:04 +0000 (14:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 14:14:04 +0000 (14:14 +0000)
     and e581954deb5a324601622193ea8b581924f9e4b1


Trivial merge