merge of 4648f865a842cefe397db73feeab9f094661b71c
authorHolger Freyther <zecke@selfish.org>
Wed, 14 Dec 2005 16:20:18 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Dec 2005 16:20:18 +0000 (16:20 +0000)
     and 95588e59115518a149f9b537e1682e031b795891


Trivial merge