merge of 'ac4b5988727da1d0b584ac9a22c5fa12a864842f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 15:25:44 +0000 (15:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 15:25:44 +0000 (15:25 +0000)
commitdc1cd1533bdce9aa8b8b7ce0938b170d97b587c7
tree742c0ff1dc5b75093271b72abadcf78bdb2adcfa
parente4ad59a4bcefc874584d4e207501c3839cf99afc
parent51c54fb7c96ee033fcf1c4a22262a744979abfa7
Merge ... 'ac4b5988727da1d0b584ac9a22c5fa12a864842f'
     and 'e0fcc3e13cf457c4a58354625e80d7451ff357b7'