From: Kevin Grittner <Kevin.Grittner@wicourts.gov>
Date: Tue, 9 Aug 2011 14:06:50 +0000 (-0500)
Subject: Merge branch 'master' into bug6123
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=refs%2Fheads%2Fbug6123;p=users%2Fkgrittn%2Fpostgres.git

Merge branch 'master' into bug6123
---

4ab003fa8692a7c88300435ccc864efd1cf5e896