merge of '92277d433e8689dae991647461e4b7cbf7f3b2ab'
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Sep 2007 08:19:29 +0000 (08:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 6 Sep 2007 08:19:29 +0000 (08:19 +0000)
commitef795cace24b1dadce6d5be42985920cd5e47f22
treee98eb43e38e57b50857c15e61519798c9170bf16
parent69be25f5d1e83ee279cc286e67ace024a2a30665
parent642473871f304eda91209da4bfa9ed6ce7dd72a1
Merge ... '92277d433e8689dae991647461e4b7cbf7f3b2ab'
     and 'ce91420f334d73451c6d91e2805ea5844eb6b4ae'