merge of 6ab2f457e844b836d62477722d28ecf0f43b8572
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Nov 2005 01:05:48 +0000 (01:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 24 Nov 2005 01:05:48 +0000 (01:05 +0000)
     and 903d95abd719ae9ee7621a75ccf9ddace7ea1bbb


Trivial merge