Merge commit '9ac5e4aea125e706201c61b0ccb13a2cafe5618f' into clipping

author Dan Vanderkam <danvdk@gmail.com>

Sat, 20 Feb 2010 01:42:44 +0000 (17:42 -0800)

committer Dan Vanderkam <danvdk@gmail.com>

Sat, 20 Feb 2010 01:42:44 +0000 (17:42 -0800)
author Dan Vanderkam <danvdk@gmail.com>
Sat, 20 Feb 2010 01:42:44 +0000 (17:42 -0800)
committer Dan Vanderkam <danvdk@gmail.com>
Sat, 20 Feb 2010 01:42:44 +0000 (17:42 -0800)
diff --cc dygraph-canvas.js
Simple merge
diff --cc dygraph.js
Simple merge
author	Dan Vanderkam <danvdk@gmail.com>
	Sat, 20 Feb 2010 01:42:44 +0000 (17:42 -0800)
committer	Dan Vanderkam <danvdk@gmail.com>
	Sat, 20 Feb 2010 01:42:44 +0000 (17:42 -0800)
		1	2
dygraph-canvas.js	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history