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