merge of 6c8af3e5626e2962745d40f48121c1f325288cda
authorKoen Kooi <koen@openembedded.org>
Tue, 27 Jun 2006 10:22:56 +0000 (10:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Jun 2006 10:22:56 +0000 (10:22 +0000)
     and d5cd44e4415b52831c79b2b82d546c0ba8c24528


Trivial merge