Fix for Mantis 1072: Produce an error if a routine is Replaced to two different symbols
Update copyright to 2013
Merge branch 'davidk'