Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 12 Dec 2010 21:03:42 +0000 (16:03 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 12 Dec 2010 21:03:42 +0000 (16:03 -0500)

Trivial merge