merge of 6140847fcfac52c881f2bf65906299e435571b8f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Jan 2006 10:59:59 +0000 (10:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 10:59:59 +0000 (10:59 +0000)
     and 9c6d2f9ed3be4745760b4dcd14811587f4acd623


Trivial merge