merge of '21cc63203b5df2e8d90f0a909db0ffa185502b72'
authorKoen Kooi <koen@openembedded.org>
Mon, 30 Jul 2007 11:31:03 +0000 (11:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 30 Jul 2007 11:31:03 +0000 (11:31 +0000)
commitcca7de1567a0a1e6cedd31607ebd8700d0ef6ecd
tree6638b6d81435f5910ad17c81042eb2dd3963eb30
parent3c6bdd293e75211bb070789bbeadbe5ebf5e4a32
parent929f61d2aef5cf85e6d88cdbcf542c838a03bf34
Merge ... '21cc63203b5df2e8d90f0a909db0ffa185502b72'
     and 'f87475ccf1fd18294a9edb79090422cc8f201753'