Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 11 Oct 2010 19:15:09 +0000 (15:15 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 11 Oct 2010 19:15:09 +0000 (15:15 -0400)

Trivial merge