Merge pull request #328 from nico/canonperf
authorEvan Martin <martine@danga.com>
Fri, 15 Jun 2012 19:40:05 +0000 (12:40 -0700)
committerEvan Martin <martine@danga.com>
Fri, 15 Jun 2012 19:40:05 +0000 (12:40 -0700)
add canon_perftest

1  2 
configure.py

diff --cc configure.py
Simple merge