This commit was manufactured by cvs2svn to create branch 'data_driven'.

[SVN r8230]
Added a little compile-time safety


[SVN r8235]
no message


[SVN r8236]