change copyright for a file and fix bug comparing branch with upstream
change copyright for a file and fix bug comparing branch with upstream

DrXyzzy/smc,tscholl2/smc,sagemathinc/smc,sagemathinc/smc,tscholl2/smc,tscholl2/smc,sagemathinc/smc,sagemathinc/smc,tscholl2/smc,DrXyzzy/smc,tscholl2/smc,DrXyzzy/smc,DrXyzzy/smc