Merge remote-tracking branch 'working/collab/miker/unapi2_subobject_improvement'...
authorDan Scott <dscott@laurentian.ca>
Wed, 14 Dec 2011 18:41:33 +0000 (13:41 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 14 Dec 2011 18:41:33 +0000 (13:41 -0500)

Trivial merge