merge of 6ac1a4c52127b4cff0f1697486446d35bc700a93
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 21 Jan 2006 01:37:55 +0000 (01:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 01:37:55 +0000 (01:37 +0000)
     and 974f590a7b8d1debd7106739e6e644f150d015fc


Trivial merge