merge of 146608cb9e3b0c4ee68e611a117558706e6cbecb
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Jul 2006 16:14:47 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 16:14:47 +0000 (16:14 +0000)
     and 6daf673dad5c7bf9a40a8de599ddd3e43c9c2a65


Trivial merge