Merge branch 'tmp_branch'
authorDan Vanderkam <dan@dygraphs.com>
Fri, 8 Jun 2012 20:01:53 +0000 (16:01 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Fri, 8 Jun 2012 20:01:53 +0000 (16:01 -0400)

Trivial merge