Merge branch 'rt/trans'
authorPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 19 Jun 2012 20:34:11 +0000 (19 21:34 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 19 Jun 2012 20:34:11 +0000 (19 21:34 +0100)

Trivial merge