Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 3 Oct 2012 19:43:26 +0000 (15:43 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 3 Oct 2012 19:43:26 +0000 (15:43 -0400)

Trivial merge