Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 13 Dec 2010 19:28:59 +0000 (14:28 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 13 Dec 2010 19:28:59 +0000 (14:28 -0500)
commitbc530fe89fa2be0bbb991c4f65b187fc1dc00792
treec8854837da3e136d146e2d31c82d363b6cce31a9
parent9c17a685bdd69f60c3140f6d502696c880254893
parentfc73ad644f0b87b91f49b7f6f6b2348f78bdbbf4
Merge remote branch 'refs/remotes/svn/trunk' into svn