Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 18 Nov 2010 01:51:36 +0000 (20:51 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 18 Nov 2010 01:51:36 +0000 (20:51 -0500)

Trivial merge