Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Tue, 2 Oct 2012 20:52:03 +0000 (16:52 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 2 Oct 2012 20:52:03 +0000 (16:52 -0400)

Trivial merge