Merge remote branch 'remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 5 Oct 2010 18:14:17 +0000 (14:14 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 5 Oct 2010 18:14:17 +0000 (14:14 -0400)

Trivial merge