merge from improvements on the 1.0 branch:
[monitor.git] / www / __init__.py