Merge branch 'benchmark-refactor-2'
authorisaacs <i@izs.me>
Wed, 20 Feb 2013 01:17:29 +0000 (17:17 -0800)
committerisaacs <i@izs.me>
Wed, 20 Feb 2013 01:17:29 +0000 (17:17 -0800)

Trivial merge