Merge commit 'svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 18:15:51 +0000 (18:15 +0000)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 18:15:51 +0000 (18:15 +0000)
commit6ce5af574f5fce3d51c1a766fcfc9aaee428c924
tree63198af81e148bbda6238964c0405d7f80303375
parent81b2d877fbae9f99444e0393ff4514ea999ff1ad
parent8d13ca1f11c206188e016546e5ebf7c18c884021
Merge commit 'svn/trunk' into svn