- removed invalid mergeinfo entry (r25139 was supposedly merged from trunk,
while this is a revision from the cpstrrtl branch)

git-svn-id: branches/fixes_2_6@26648 -