Merge branch 'two_axes'
authorDan Vanderkam <danvdk@gmail.com>
Fri, 22 Oct 2010 03:26:15 +0000 (23:26 -0400)
committerDan Vanderkam <danvdk@gmail.com>
Fri, 22 Oct 2010 03:26:15 +0000 (23:26 -0400)

Trivial merge