Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 9 Sep 2010 18:26:53 +0000 (14:26 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 9 Sep 2010 18:26:53 +0000 (14:26 -0400)

Trivial merge