merge of '77bf6cf9356d5ff7595faaf06c5e8138020cb353'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Dec 2006 12:31:36 +0000 (12:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Dec 2006 12:31:36 +0000 (12:31 +0000)
commit0a94fdbbd406c6583ff9fceb1a19206ba376784a
treee2a518ce79ff6ec8005f478a6908f3dbd79f0d9c
parent10634dfbae6a9780c161adca89801e01d0b335da
parentb21529ab1cced18810128645660543f3f980b7aa
Merge ... '77bf6cf9356d5ff7595faaf06c5e8138020cb353'
     and '9a127619747044880301661798d91082df6b5d72'