merge of 017e300c655c242acf6836a1ede06b9973369572
authorHolger Freyther <zecke@selfish.org>
Sun, 24 Jul 2005 11:05:28 +0000 (11:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 11:05:28 +0000 (11:05 +0000)
     and 761267fc11ac8b45721809d4331ac37edb7c9e77


Trivial merge