merge of 889c17fb00a7db9ccb772e522e5d84a4cc218ff8
authorPatrick Ohly <patrick.ohly@gmx.de>
Wed, 24 Aug 2005 20:54:03 +0000 (20:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 20:54:03 +0000 (20:54 +0000)
     and b4bff47a815e0e0e2e911dc25e7390b6de29e41e


Trivial merge