b=245476, patch by jonathan.watt@strath.ac.uk, r=peterv, sr=jst remove redundant declarations and correct comment b=251824, patch by jonathan.watt@strath.ac.uk, r+sr=peterv git-svn-id: svn://10.0.0.236/trunk@159462 18797224-902f-48f8-a5cc-f745e15eee43