merge of 0891623e6f467a1ec0b2b34526d3c23593360df1
authorHolger Freyther <zecke@selfish.org>
Sun, 30 Apr 2006 12:31:21 +0000 (12:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 12:31:21 +0000 (12:31 +0000)
     and 8b0bc8c41b0802e756c70c90ed7dc760e76bb9bf


Trivial merge