This commit was manufactured by cvs2svn to create tag 'BEFORE_FUNCS_MERGE'. svn path=/tags/BEFORE_FUNCS_MERGE/; revision=827
