Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sun, 11 Nov 2012 11:52:15 +0000 (06:52 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 11 Nov 2012 11:52:15 +0000 (06:52 -0500)

Trivial merge