Should not depend on options - that's why the files are separate.
Should not depend on options - that's why the files are separate.

git-svn-id: https://svn.sable.mcgill.ca/mclab/Project@351 89b902b4-d83f-0410-b942-89f7a419ffdb

Migrated from Sable/mclab@4218dc24b55c3b22ee511a2f1012a1c5b26bfacc

Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core,Sable/mclab-core