merge of 055fac88594cb867a9e5f8bc0c610cd1d94dad73
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 8 May 2006 13:31:52 +0000 (13:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 13:31:52 +0000 (13:31 +0000)
     and 1b82a010f298211ce50ff06d99b1761cedbb5d3a


Trivial merge