merge of 4719567c59f1d982327cbf37da292cdc3a68caff
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jan 2006 11:39:55 +0000 (11:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 11:39:55 +0000 (11:39 +0000)
     and c0e8f2d1f1cfa6657c523c85c3c544b2ec8ee9c6


Trivial merge