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)
commit9e8e64d9713add649f254706e3da09ef4c235993
treed123746f3863b76f57174cab4cf773b91b02f46a
parent3dc39676503352ebbab0b64d50495485353d2de1
parent0f32d2861643a39a2fca2e9c4505a2183ecf41d1
merge of 2e72ff814146cd6f8905742854f09312f89f7f5e
     and 7bea148102c0724aff0e6a3c580de23677685c48