 +  return 0;
 +}
 diff -ruN trilinos-11.14.3-orig/packages/nox/src-lapack/NOX_LAPACK_Matrix.H trilinos-11.14.3/packages/nox/src-lapack/NOX_LAPACK_Matrix.H
---- trilinos-11.14.3-orig/packages/nox/src-lapack/NOX_LAPACK_Matrix.H	2015-04-17 13:05:04.000000000 -0600
-+++ trilinos-11.14.3/packages/nox/src-lapack/NOX_LAPACK_Matrix.H	2015-04-27 12:36:17.000000000 -0600
+--- trilinos-11.14.3-orig/packages/nox/src-lapack/NOX_LAPACK_Matrix.H	2015-04-17 15:05:04.000000000 -0400
++++ trilinos-11.14.3/packages/nox/src-lapack/NOX_LAPACK_Matrix.H	2015-04-29 18:21:03.638045123 -0400
 @@ -104,7 +104,7 @@
          stream << operator()(i,j) << " ";
        stream << "]" << std::endl;

 
 #ifdef HAVE_ML_TEUCHOS
diff -ruN trilinos-11.14.3-orig/packages/ml/src/Utils/ml_utils.c trilinos-11.14.3/packages/ml/src/Utils/ml_utils.c
--- trilinos-11.14.3-orig/packages/ml/src/Utils/ml_utils.c	2015-04-17 13:01:27.000000000 -0600
+++ trilinos-11.14.3/packages/ml/src/Utils/ml_utils.c	2015-04-27 12:36:17.000000000 -0600
@@ -1957,13 +1957,15 @@
       if (i == mypid) {
 #if defined(TFLOP) || defined(JANUS_STLPORT) || defined(COUGAR)

   typedef int64_t ex_entity_id;
   
diff -ruN trilinos-11.14.3-orig/packages/teuchos/numerics/src/Teuchos_BLAS.cpp trilinos-11.14.3/packages/teuchos/numerics/src/Teuchos_BLAS.cpp
--- trilinos-11.14.3-orig/packages/teuchos/numerics/src/Teuchos_BLAS.cpp	2015-04-17 15:01:34.000000000 -0400
+++ trilinos-11.14.3/packages/teuchos/numerics/src/Teuchos_BLAS.cpp	2015-04-29 18:21:03.641045123 -0400
@@ -111,7 +111,8 @@
 
 //Explicitly instantiating these templates for windows due to an issue with
