Merge remote branch 'refs/remotes/svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 8 Nov 2010 23:05:34 +0000 (18:05 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 8 Nov 2010 23:05:34 +0000 (18:05 -0500)
commit5d4b0c9026a46b63a996fcd10bad3b6db6405f25
treef45c70b41427ee7e03c016aee1ff886c5bc0811e
parentde374ba6b1cda78fd146c675af0e8f05cd2f8624
parent461764cbbea5965ebbd248f221876743d7a9ccd4
Merge remote branch 'refs/remotes/svn/trunk' into svn