r3516 rjek - /branches/1.1/