Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 16 Dec 2010 18:24:47 +0000 (13:24 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 16 Dec 2010 18:24:47 +0000 (13:24 -0500)
commit825076061772d4c8105f9ef22f1397b318eebff7
tree3ed887f51974f157477c5b538aa5992703cefa87
parent55c43da5d8606f7abd22ee7af290cf10bb865f6a
parent59948a6e1cdc55401d712c731be8558838a525fc
Merge remote branch 'refs/remotes/svn/trunk' into svn