mseaton
committed
on 26 Mar 07
merger from head + monitoring dictionary update