Merge branch 'master' into frac_reg
authorDan Vanderkam <danvdk@gmail.com>
Thu, 21 Oct 2010 12:37:12 +0000 (08:37 -0400)
committerDan Vanderkam <danvdk@gmail.com>
Thu, 21 Oct 2010 12:37:12 +0000 (08:37 -0400)

Trivial merge