Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 1 Oct 2010 15:25:09 +0000 (11:25 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 1 Oct 2010 15:25:09 +0000 (11:25 -0400)

Trivial merge