Merged: -r 583:606 from /framework/branches/sessions, full merge of sessions branch
Authored by: artyom-beilis 2009-01-01
Parent: [r606]
Child: [r608]