merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 15:49:26 +0000 (15:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 15:49:26 +0000 (15:49 +0000)
     and 88adaace5b8cfe88c5164b75dc29d943a114c8f5


Trivial merge