Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 24 Oct 2010 01:32:19 +0000 (21:32 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 24 Oct 2010 01:32:19 +0000 (21:32 -0400)

Trivial merge