merge of ea784b81f1d057de11cac0f979a22ebe0d182bcb
authorHolger Freyther <zecke@selfish.org>
Mon, 1 Aug 2005 23:05:40 +0000 (23:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 23:05:40 +0000 (23:05 +0000)
     and f72a07a8eb8923cfccd905caf2ce6b3521add7df


Trivial merge