Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 7 Sep 2010 01:51:27 +0000 (21:51 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 7 Sep 2010 01:51:27 +0000 (21:51 -0400)

Trivial merge