Merge 'count_distinct' into 'trunk'
Peter Rabbitson [Tue, 12 May 2009 05:02:56 +0000 (05:02 +0000)]

Trivial merge