Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 13 Dec 2010 19:28:59 +0000 (14:28 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 13 Dec 2010 19:28:59 +0000 (14:28 -0500)

Trivial merge