bug 892122: bustage fix for 64-bit slave platforms. r=bustage
merge heads