Merge branch 'user/dbs/tpac_propagate_search_loc' into dbs/master_servant user/dbs/master_servant
authorDan Scott <dscott@laurentian.ca>
Mon, 5 Dec 2011 17:19:37 +0000 (12:19 -0500)
committerDan Scott <dscott@laurentian.ca>
Mon, 5 Dec 2011 17:24:26 +0000 (12:24 -0500)

Trivial merge