Merge 'joined_count' into 'trunk'
Peter Rabbitson [Tue, 19 May 2009 17:42:59 +0000 (17:42 +0000)]

Trivial merge