merge of 10e936f740ef32098dd4610aa27ba7185cd6085d
authorHolger Freyther <zecke@selfish.org>
Sat, 13 May 2006 23:13:07 +0000 (23:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 23:13:07 +0000 (23:13 +0000)
     and 82c13a21dde3f0f2d3f5d69aa63c1c1f3b51d38e


Trivial merge