+minor changes, so that I can have them while im gone
Authored by: danmitch 2010-06-22
Parent: [r845]
Child: [r847]