Fixed for SPARC64
(cherry picked from commit 4f024b7ba9b472d1ec80b05cec49e8d41c370aa3)

Conflicts:
	ChangeLog (Moved to 'Branch 1.1')
2 files changed