merge of '4a084d17d8150e500fccc6f78c116ab863359656'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 20 Dec 2007 13:46:39 +0000 (13:46 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 20 Dec 2007 13:46:39 +0000 (13:46 +0000)
commit86bcee69139c7ef92e12510e6c5158247ffacb69
tree1b725d92c8783493446aeabe5659711fda3b8831
parente32b9ba8ea0ae8ed77f69d852658599d2e497dfa
parent60d97c2ce048b27e3fe6535d57300b9a1c9f9547
Merge ... '4a084d17d8150e500fccc6f78c116ab863359656'
     and '634115f7cb55bed1cb0ad082cb66c596be1b6d40'