Merge remote-tracking branch 'working/user/artunit/resolver_resolver_timeout_2012_01_...
authorDan Scott <dscott@laurentian.ca>
Thu, 5 Jan 2012 17:01:27 +0000 (12:01 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 5 Jan 2012 17:01:27 +0000 (12:01 -0500)

Trivial merge