E&S CVS Commit: PEAK-Rules - Drop superfluous Conjunction subclasses in favor of just using

[pje at eby-sarna.com]

Author: pje
Date: Wed Aug 18 01:16:43 2010
New Revision: 2680

URL: http://svn.eby-sarna.com?rev=2680&view=rev
Log:
Drop superfluous Conjunction subclasses in favor of just using 
Conjunction in the first place.  Classes and NotObjects were a holdover 
from when I thought the right side of a Test would determine what kind 
of operation would be performed and how it would be indexed.

Modified:
    PEAK-Rules/Criteria.txt
    PEAK-Rules/Indexing.txt
    PEAK-Rules/Predicates.txt
    PEAK-Rules/peak/rules/criteria.py
    PEAK-Rules/test_rules.py