Merge remote branch 'svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 17:14:52 +0000 (13:14 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 17:14:52 +0000 (13:14 -0400)

Trivial merge