Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Fri, 17 Dec 2010 21:23:47 +0000 (16:23 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Fri, 17 Dec 2010 21:23:47 +0000 (16:23 -0500)
commit5568d82c26d59aa90df22a6ac0900a93a5731aaf
tree005ea82c324209209f7f4e829445432ba2a7eab5
parent825076061772d4c8105f9ef22f1397b318eebff7
parent1c0bf23ba2e0cf5127518856cb2f46f56fbc6a20
Merge remote branch 'refs/remotes/svn/trunk' into svn