From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 26 Sep 2008 14:07:40 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~3^2~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30ef1d812cc57d128e1d4d666de4e9bb5577e9e3;p=git.git

Merge branch 'maint'
---

30ef1d812cc57d128e1d4d666de4e9bb5577e9e3