Merge 'trunk' into 'count_distinct'
Justin Hunter [Sat, 14 Mar 2009 13:55:55 +0000 (13:55 +0000)]
created count_distinct branch


Trivial merge