merge of 67ad681c17b58ee0ff1e672b4aa634ab523a9e11
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 19 Jun 2006 21:33:47 +0000 (21:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Jun 2006 21:33:47 +0000 (21:33 +0000)
     and f964e908fbdc16f8a354efde04a6cd7a81ce0a6a


Trivial merge