merge of '07c919d18fca5a836fd51fcd05e0c09e6a9482e0'
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 15:58:12 +0000 (15:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 15:58:12 +0000 (15:58 +0000)
commitb005e92be2bc359a1e8506339f2916bd92d48e0e
treea841c72e8ab9108d5e880571004a797ae45ab05a
parent2e8c09716712fdd9ea2c8f373259d18dec1901b0
parentef870450ab6c3d30a7455e19b7552e7ae1d702b2
Merge ... '07c919d18fca5a836fd51fcd05e0c09e6a9482e0'
     and 'a1ea6d789a1f6e3cf92b2e5ce75c98162525ea4f'