/trunk
Moved "Listing n of m <blahs> in <foo>" to its own template, and shuffled code to match Misc changes, checkpoint