--- mozilla-esr10/configure.orig	2012-10-27 16:23:16.929020346 -0400
+++ mozilla-esr10/configure	2012-10-27 16:30:59.866857363 -0400
@@ -13576,11 +13576,14 @@
 		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
 
 		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
-			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+			sed 's/\([0-9]*\).\([0-9]*\)\(.\([0-9]*\)\)*/\1/'`
 		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
-			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+			sed 's/\([0-9]*\).\([0-9]*\)\(.\([0-9]*\)\)*/\2/'`
 		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
-			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+			sed 's/\([0-9]*\).\([0-9]*\)\(.\([0-9]*\)\)*/\4/'`
+		if test -z "$nss_config_micro_version"; then
+			nss_config_micro_version=0
+		fi
 		min_nss_major_version=`echo $min_nss_version | \
 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
 		min_nss_minor_version=`echo $min_nss_version | \
--- mozilla-esr10/build/autoconf/nss.m4.orig	2012-10-27 16:29:46.683556140 -0400
+++ mozilla-esr10/build/autoconf/nss.m4	2012-10-27 16:31:44.317506809 -0400
@@ -45,11 +45,14 @@
 		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
 
 		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+			sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)*/\1/'`
 		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+			sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)*/\2/'`
 		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
-			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+			sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\)*/\4/'`
+		if test -z "$nss_config_micro_version"; then
+			nss_config_micro_version=0
+		fi
 		min_nss_major_version=`echo $min_nss_version | \
 			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
 		min_nss_minor_version=`echo $min_nss_version | \