Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 10 Nov 2010 16:45:51 +0000 (11:45 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 10 Nov 2010 16:45:51 +0000 (11:45 -0500)

Trivial merge