CVS commit by metz: make TODO reflect current OSCAr state M +33 -44 TODO 1.24