Merge branch 'amd64-load-char-bug'
authorTaylor R Campbell <campbell@mumble.net>
Wed, 11 Jul 2012 01:37:40 +0000 (01:37 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Wed, 11 Jul 2012 01:37:40 +0000 (01:37 +0000)

Trivial merge