Merge commit 'svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 18:15:51 +0000 (18:15 +0000)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 18:15:51 +0000 (18:15 +0000)

Trivial merge