Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 19 Sep 2010 23:29:03 +0000 (19:29 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 19 Sep 2010 23:29:03 +0000 (19:29 -0400)

Trivial merge