tree 1465fa12fd8127c4c76405f0fc3d1c44583365d4
parent 03bcaacaadbb325f412e6dffec27fea6acb9321e
parent 9529a2524a29c15107905f2f8f0b310a40880dc7
author Junio C Hamano <junkio@cox.net> 1175121597 -0700
committer Junio C Hamano <junkio@cox.net> 1175121597 -0700

Merge branch 'maint' to synchronize with 1.5.0.6