merge of '289a0ae2ef5b937f19a659d56d37d2b368af059b'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 11:08:36 +0000 (11:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 11:08:36 +0000 (11:08 +0000)
commit4ea206355ef5f3240d89b8e6a008df8ef15d7b96
treedf1ee7fea5c82f0df08db0f2f4f521d078c371bf
parent7143b95dbfddaa91006b679d16f8e4e9907c4907
parentd19f966b037acf56964c24e527db5e3dad2f5fae
Merge ... '289a0ae2ef5b937f19a659d56d37d2b368af059b'
     and '51d9e57dcb74a214f91e70c080c84da43520598b'