Fixed 64-bit fixup issue#36

n-o-o-n wants to merge 2 commits intokeystone-engine:masterkeystone-engine/keypatch:masterfrom

n-o-o-n:mastern-o-o-n/keypatch:masterCopy head branch name to clipboard