merge of 3c8d71924f7bdcbdae81f3b602e2657fc399b427
authorHolger Freyther <zecke@selfish.org>
Sun, 19 Feb 2006 20:16:25 +0000 (20:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Feb 2006 20:16:25 +0000 (20:16 +0000)
     and 55fb04a1bc7331f99333777f4deecc8c07383314


Trivial merge