Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 19 Oct 2010 18:17:18 +0000 (14:17 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 19 Oct 2010 18:17:18 +0000 (14:17 -0400)

Trivial merge