Merge remote-tracking branch 'working/user/dbs/avoid_901c_death' into dbs/master_servant
authorDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:36:13 +0000 (23:36 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 2 Dec 2011 04:36:13 +0000 (23:36 -0500)

Trivial merge