merge of 8b751e588b401c6381aeb1ce5afd7e1819ee5236
authorHolger Freyther <zecke@selfish.org>
Sun, 30 Apr 2006 23:13:02 +0000 (23:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 23:13:02 +0000 (23:13 +0000)
     and beca23d1fb2844c8e6092379104415279cb10fab


Trivial merge