merge of 1fd96e7d233a7113f1bee08df16d96bcff4340b1
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Jan 2006 11:00:20 +0000 (11:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 11:00:20 +0000 (11:00 +0000)
     and b4a513218154eb17b59ed896ac7e0037ab11fc14


Trivial merge