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

Trivial merge