r11060: merging new eventlog code from trunk