Copy changes from trunk 2012-04-09T18:12:40Z!schwab@linux-m68k.org to fix letter...