merge of 30639ddeefa3cbe079a4a2314acd8e784e2f8ee5
authorHolger Freyther <zecke@selfish.org>
Tue, 26 Jul 2005 15:06:44 +0000 (15:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jul 2005 15:06:44 +0000 (15:06 +0000)
     and 77ba9cf52d18f231b869c8fc1a7a5f6052646224


Trivial merge