Merge remote branch 'remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 7 Oct 2010 01:20:16 +0000 (21:20 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 7 Oct 2010 01:20:16 +0000 (21:20 -0400)

Trivial merge