arrgh, another change overwritten due to a developer's failure to merge/update before push. Sigh. I guess we just suck at DVCS.