Automated merge with http://hg.softcircuit.com.au/projects/circuits/
Automated merge with http://hg.softcircuit.com.au/projects/circuits/

treemo/circuits,nizox/circuits,eriol/circuits,eriol/circuits,treemo/circuits,treemo/circuits,eriol/circuits