merge of 1ee22e5dc2cdeec8a88f1136a019329901a0c9f3
authorHolger Freyther <zecke@selfish.org>
Sat, 13 May 2006 23:02:05 +0000 (23:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 23:02:05 +0000 (23:02 +0000)
     and fa3e1e73f0b7c3d2d474cf62d9f0eb34c322dbb5


Trivial merge