merge of 6029762614e74534170906ecb131ae77e538955a
authorHolger Freyther <zecke@selfish.org>
Mon, 12 Sep 2005 21:10:53 +0000 (21:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 21:10:53 +0000 (21:10 +0000)
     and ce09177d9406163786f3a1d49ad0c9a23b1a8fc5


Trivial merge