Improvements for the counts for the MASTER record.
Authored by: bugman 2008-07-05
Parent: [r6720]
Child: [r6722]