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

Trivial merge