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

Trivial merge