Merge 'trunk' into 'sybase'
Rafael Kitover [Thu, 4 Jun 2009 09:55:52 +0000 (09:55 +0000)]
r5325@hlagh (orig r6495):  ribasushi | 2009-06-04 00:35:25 -0700
Move relationship tests around
r5328@hlagh (orig r6498):  ribasushi | 2009-06-04 02:52:18 -0700
Delegate actual counting to the storage class


Trivial merge