merge of 10c91c11403b2d2d4fa391bee1e6f60bfdf75c08
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 21 Jul 2005 20:35:58 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 20:35:58 +0000 (20:35 +0000)
     and f4954b87346baa782592647d49aced9350906ce0


Trivial merge