J. Lewis Muir - 2012-04-14

Patch against Subversion trunk