merge of 15add738eb54d20132cb520348c334580b071e35
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 15 Mar 2006 11:53:13 +0000 (11:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Mar 2006 11:53:13 +0000 (11:53 +0000)
     and b08ae13eaefb15f3a4908e4d72a9fcf212733c72


Trivial merge