Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 13 Sep 2010 14:46:31 +0000 (10:46 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 13 Sep 2010 14:46:31 +0000 (10:46 -0400)

Trivial merge