Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 16 Dec 2010 18:24:47 +0000 (13:24 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 16 Dec 2010 18:24:47 +0000 (13:24 -0500)

Trivial merge