merge of 0deaec7d8f25d48f053907f69869ff62a2482979
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 27 Jan 2006 13:42:42 +0000 (13:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jan 2006 13:42:42 +0000 (13:42 +0000)
     and fa6466b9a9efc26225aa474f2d3f2e558f3e993f


Trivial merge