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

Trivial merge