Merge branch 'master' into plotter
authorDan Vanderkam <danvdk@gmail.com>
Fri, 27 Nov 2009 16:49:29 +0000 (11:49 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Fri, 27 Nov 2009 16:49:29 +0000 (11:49 -0500)

Trivial merge