This commit was manufactured by cvs2svn to create branch 'data_driven'.
Added a little compile-time safety
no message