carnap - Revision 330: /svn/branch/Camerons_work_in_progress