Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 6 Dec 2010 23:58:31 +0000 (18:58 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 6 Dec 2010 23:58:31 +0000 (18:58 -0500)

Trivial merge