Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 4 Nov 2010 00:24:50 +0000 (20:24 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 4 Nov 2010 00:24:50 +0000 (20:24 -0400)

Trivial merge