merge of 2f0e7f1ce8fbde6583638fca4ada465528b71877
authorHolger Freyther <zecke@selfish.org>
Mon, 13 Feb 2006 23:35:46 +0000 (23:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Feb 2006 23:35:46 +0000 (23:35 +0000)
     and 95c97dee265267bc2a5993da60c3e2e716644392


Trivial merge