merge of 4bab829d6e0b67e537734ef4a2e79ef512e4e9eb
authorHolger Freyther <zecke@selfish.org>
Sat, 9 Jul 2005 12:39:05 +0000 (12:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 12:39:05 +0000 (12:39 +0000)
     and fc5f4f47b13aa95efb2b9921fc70f00b5cd26ae2


Trivial merge