merge of 86a447fd0f337e15aaf4a48806a2b49968398915
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 24 Jan 2006 16:43:59 +0000 (16:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 16:43:59 +0000 (16:43 +0000)
     and 8fb93f5436990ed75cc95bd943b940ebdc9ae323


Trivial merge