CVS commit by lukas: this can go R ChangeLog 1.1