Merge branch 'release/1.0.5-M2'

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.xerial.snappy</groupId>
   <artifactId>snappy-java</artifactId>
-  <version>1.0.5-M1</version>
+  <version>1.0.5-M2</version>
   <name>Snappy for Java</name>
   <description>snappy-java: A fast compression/decompression library</description>
   <packaging>bundle</packaging>

src/main/java/org/xerial/snappy/OSInfo.java

@@ -77,7 +77,10 @@ public class OSInfo
             catch (InterruptedException e) {
                 // ignored: fall back to "arm" arch (soft-float ABI)
             }
-        }
+        } 
+	else if(getOSName().equals("Mac") && osArch.equals("universal")) {
+	    return "x86_64"; // Fix for openjdk7 
+	}
         return translateArchNameToFolderName(osArch);
     }