New branch 'feature/calc-matrix-rework' available with the following commits:
commit 85eac9385e4e6e5d3b921af748b517eee3d0a61e
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Nov 5 17:39:54 2010 -0400
Ported my previous work into this branch. Not build-tested yet.