Merge remote branch 'svn/trunk' into svn
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 17:14:52 +0000 (13:14 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 23 Sep 2010 17:14:52 +0000 (13:14 -0400)
commit3764c12b1f05c554c8db4af7605302dd21d31325
tree3088b379ceee6fadebd435a62433c34ae6dfc827
parent645cc8cf4983a9085c8b0ec6e68791d569fda9c5
parent9b8eb4d6907502e9b1e74b62a850a11655d50ab5
Merge remote branch 'svn/trunk' into svn