Merge branch 'rounding'
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 2 Mar 2011 20:03:49 +0000 (15:03 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 2 Mar 2011 20:03:49 +0000 (15:03 -0500)

Trivial merge