merge of '0285e32ca4006ec769b788f9d74dac4d57326bf4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 16 Dec 2006 15:50:53 +0000 (15:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 16 Dec 2006 15:50:53 +0000 (15:50 +0000)
commite8d54ebb210cda9477e57bd7c9fa48092f930856
tree54f388e05a12d9086d722050f2398afa63e0b62a
parent12fcf3b44e2f1e0f573052a2a0fa867306388541
parentb54f9af2030891f28312ea21869168df52dae9ce
Merge ... '0285e32ca4006ec769b788f9d74dac4d57326bf4'
     and '08336880338eaa13f4281f4b644f44ab9fb3014c'