90845c15d260d7916aa79800ccf054bed7ed81e3 51229db7af0db6148fe8ceacbd01a7a526c18da6 James Antill <james@and.org> 1227161732 -0500	pull : Fast forward
51229db7af0db6148fe8ceacbd01a7a526c18da6 b6b1403e553d435d900781c256f14bb6c8276929 James Antill <james@and.org> 1227288405 -0500	merge test-master: Fast forward
e85c2da243298e0ba392cf7c2bdc47e24dc50a85 0ea797b98915a81b125afecb78b7c009ed349ed0 James Antill <james@and.org> 1228142595 -0500	merge yum-3_2_X: Merge made by recursive.
0ea797b98915a81b125afecb78b7c009ed349ed0 adaad312bbd3adb3fc46763a2a9f397311f3363b James Antill <james@and.org> 1228322252 -0500	merge yum-3_2_X: Merge made by recursive.
adaad312bbd3adb3fc46763a2a9f397311f3363b c247ff3192384fcd81367da1659a207604ec71c7 James Antill <james@and.org> 1231114141 -0500	commit (merge): Fix minor conflict, due to logging