Merge branch 'rt/trans'

Pat Thoyts committed Jun 19, 2012 at 21:34 UTC 272b9296397af4ad35770dec6c731d1b387654db

No changes.