Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 10 Sep 2010 23:18:27 +0000 (19:18 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 10 Sep 2010 23:18:27 +0000 (19:18 -0400)

Trivial merge