merge of 41ea97e1b1f6b95460ba05a33629865ebf33e4b9
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 14 Jul 2006 10:59:09 +0000 (10:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 10:59:09 +0000 (10:59 +0000)
     and 77ac90872633beed339229866c99c44cf5731ecc


Trivial merge