diff -r 633f2378c904 -r c8d320b48626 common/bin/diffjarzip.sh
--- a/common/bin/diffjarzip.sh	Mon Jun 25 21:37:09 2012 -0700
+++ b/common/bin/diffjarzip.sh	Tue Jul 03 16:11:12 2012 -0700
@@ -72,7 +72,11 @@
 fi
 
 if [ "`uname`" == "SunOS" ]; then
-    DIFF=gdiff
+    if [ -f "`which gdiff`" ]; then
+        DIFF=gdiff
+    else
+        DIFF=diff
+    fi
 else
     DIFF=diff
 fi