merge of 2e72ff814146cd6f8905742854f09312f89f7f5e
authorKoen Kooi <koen@openembedded.org>
Tue, 25 Apr 2006 10:24:10 +0000 (10:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 10:24:10 +0000 (10:24 +0000)
     and 7bea148102c0724aff0e6a3c580de23677685c48


Trivial merge