Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 8 Nov 2010 23:05:34 +0000 (18:05 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 8 Nov 2010 23:05:34 +0000 (18:05 -0500)

Trivial merge