merge of b40b9fb8b17f69ba321fa34167b8ddb37dc72ec2
authorHolger Freyther <zecke@selfish.org>
Sun, 9 Apr 2006 14:40:06 +0000 (14:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Apr 2006 14:40:06 +0000 (14:40 +0000)
     and e6a2ccb39d3b001fdcc1071ba1860678a1fe8647


Trivial merge