diff --git a/client.mk b/client.mk
index 5d1e014f85bb..196944ff946a 100644
--- a/client.mk
+++ b/client.mk
@@ -407,8 +407,8 @@ MODULES_all :=                                  \
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
 #MOZ_CO_TAG          = <tag>
-NSPR_CO_TAG          = NSPR_HEAD_20070820
-NSS_CO_TAG           = NSS_3_12_ALPHA1B
+NSPR_CO_TAG          = NSPR_HEAD_20071009
+NSS_CO_TAG           = NSS_3_12_ALPHA_2
 LDAPCSDK_CO_TAG      = LDAPCSDK_6_0_3_CLIENT_BRANCH
 LOCALES_CO_TAG       =
 
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 1bdf60884621..465ae5a98743 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -1486,7 +1486,7 @@ SECStatus nsConvertCANamesToStrings(PRArenaPool* arena, char** caNameStrings,
     SECItem* dername;
     SECStatus rv;
     int headerlen;
-    uint32 contentlen;
+    PRUint32 contentlen;
     SECItem newitem;
     int n;
     char* namestring;