diff -r e8f2a53c3d6e -r 525b2ec9bceb doc/contributions.txt
--- a/doc/contributions.txt	Fri Jun 17 17:38:24 2011 -0400
+++ b/doc/contributions.txt	Tue Jun 21 00:20:03 2011 +0200
@@ -199,6 +199,7 @@
 	OPEN-29
 	OPEN-39
 	OPEN-39
+	OPEN-99
 	SNOW-278
 	SNOW-503
 	SNOW-510
diff -r e8f2a53c3d6e -r 525b2ec9bceb indra/cmake/00-Common.cmake
--- a/indra/cmake/00-Common.cmake	Fri Jun 17 17:38:24 2011 -0400
+++ b/indra/cmake/00-Common.cmake	Tue Jun 21 00:20:03 2011 +0200
@@ -171,7 +171,10 @@
     add_definitions(-fvisibility=hidden)
     # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work.  Sigh!  The viewer doesn't need to catch SIGCHLD anyway.
     add_definitions(-DLL_IGNORE_SIGCHLD)
-    add_definitions(-march=pentium4 -mfpmath=sse)
+    if (WORD_SIZE EQUAL 32)
+      add_definitions(-march=pentium4)
+    endif (WORD_SIZE EQUAL 32)
+    add_definitions(-mfpmath=sse)
     #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2
     if (NOT STANDALONE)
       # this stops us requiring a really recent glibc at runtime