merge of 1128356cf74edd3dc9e128ad1f830a989faf8e2f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 21 Jul 2005 16:42:58 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 16:42:58 +0000 (16:42 +0000)
     and a8d45d0b05a8392ab241eca4deab7c8bc83b0a2d


Trivial merge