$ 0 0 *MERGE* Fixes for platforms with 32-bit pointers that require 64-bit values to be aligned. (tags: trunk)