merge of a55899e7fb1da0f7185db8d30edf992411f9dffc
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 4 Jul 2006 13:46:37 +0000 (13:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 13:46:37 +0000 (13:46 +0000)
     and b7cf70dfa80e94e91bcec0231eb13379bf62e4c8


Trivial merge