merge of 1008f485c5a4815b155d1b11108fdcf704c936bf
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Aug 2005 21:48:22 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 21:48:22 +0000 (21:48 +0000)
     and 697cade2183f67dfff37e0d7896d63862e7c6b4e


Trivial merge