Merge remote branch 'remotes/origin/64-bit'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 17 Jan 2011 19:24:51 +0000 (20:24 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 17 Jan 2011 19:24:51 +0000 (20:24 +0100)

Trivial merge