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

Trivial merge