merge of 40056da70781bf36b181b88a8599031c80c2b1cc
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 13 Jan 2006 21:44:54 +0000 (21:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 21:44:54 +0000 (21:44 +0000)
     and fcac3802b9b29fd5043205c7b97bb4201ec6352b


Trivial merge