sync changes
authorDan Vanderkam <dan@dygraphs.com>
Mon, 25 Jul 2011 22:49:15 +0000 (18:49 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Mon, 25 Jul 2011 22:49:15 +0000 (18:49 -0400)

Trivial merge