Merge branch 'master' into experimental-compiler
authorDavid Vázquez <davazp@gmail.com>
Sat, 18 May 2013 12:50:12 +0000 (13:50 +0100)
committerDavid Vázquez <davazp@gmail.com>
Sat, 18 May 2013 12:50:12 +0000 (13:50 +0100)

Trivial merge