merge of '4b6976e36ba815fc58bd0c8e4d468ba5c4d66aa9'
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 16:39:04 +0000 (16:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 16:39:04 +0000 (16:39 +0000)
commitaabd49ceb5c40a792f09a2bc18c6d52b40ee9c96
treea843c1bde2b96d24fcfd11946514cc2b40379d8f
parent579db42f88b68863a3f15d141b1a00205330bfac
parentd41f42db5372556164bd38d679a83bb49659adf0
Merge ... '4b6976e36ba815fc58bd0c8e4d468ba5c4d66aa9'
     and '98c0a18ce7f822abf641bfdfe37edaf50f8a1a9f'