Merge 'current' into 'deprecate_CDA'
Rafael Kitover [Wed, 30 Dec 2009 21:28:53 +0000 (21:28 +0000)]
r22316@hlagh (orig r8189):  caelum | 2009-12-30 16:27:49 -0500
rearrange some test code


Trivial merge