Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 28 Nov 2010 15:56:51 +0000 (10:56 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 28 Nov 2010 15:56:51 +0000 (10:56 -0500)

Trivial merge