Merge remote branch 'remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 5 Oct 2010 18:14:17 +0000 (14:14 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 5 Oct 2010 18:14:17 +0000 (14:14 -0400)
commita2ae4a8a0f245f6738e5b72b97dbcd45fc107321
tree27a82e7431a876901312540ef612a16773c891c6
parent5ccee900a0274d82ad5c2a6820d15c4d5a3390da
parentdc8adc3b48bb2201f2bd796a5ffa0733c30aa6e1
Merge remote branch 'remotes/svn/trunk' into svn