Alignment fix; found the hard way on sparc64 by landry@ (and thanks too
for fast access to a box!)

ok deraadt@, matthieu@
upstream: sync with latest changes

Merge branch 'cvs-tracking'