merge of 85fd10648ec4aa2a8ae0c12145857b60fe032501
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 27 Mar 2006 12:18:29 +0000 (12:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 12:18:29 +0000 (12:18 +0000)
     and 9c5379a0c5df10e0d169d6dd5f45ec4644656971


Trivial merge