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

Trivial merge