Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Sat, 9 Oct 2010 21:59:38 +0000 (17:59 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sat, 9 Oct 2010 21:59:38 +0000 (17:59 -0400)
commit687c5ef7949a7f0c388ad633b40d243ed6786c4e
tree2316e4497185d0ad9dc6065cf58faf9d7b551363
parent7d5d89856d6ba9a0a25dc5cd42897814cf124c11
parent103849419a9c014a69c76b6f96e48b66cbc838ca
Merge remote branch 'refs/remotes/svn/trunk' into svn