merged greg's recent commits

2009-08-12, b taylor