Merge remote branch 'remotes/svn/trunk' into svn

This commit is contained in:
Gavin Andresen 2010-09-02 13:42:31 -04:00
commit 2742fdfda2
11 changed files with 8762 additions and 8762 deletions