merge of dab6767a89a86747fef0c30bb89d19d0c66af8ae
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 28 Jul 2005 14:42:53 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:42:53 +0000 (14:42 +0000)
     and e1fcdfd9f2f2a7a6141992636e1bf716a50644d3


Trivial merge