Merged I18N branch to head.
authorTom Hughes <tom@compton.nu>
Sun, 31 May 2009 17:26:41 +0000 (17:26 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 31 May 2009 17:26:41 +0000 (17:26 +0000)

Trivial merge