diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp
index 1e89f31a704..63609ffae77 100644
--- a/mozilla/layout/generic/nsBulletFrame.cpp
+++ b/mozilla/layout/generic/nsBulletFrame.cpp
@@ -429,7 +429,8 @@ static void CJKIdeographicToText(PRInt32 ordinal, nsString& result,
 			 buf[--idx] = c10kUnit;
 		  if(0 != cUnit)
 			 buf[--idx] = cUnit;
-		  if((0 != cDigit) && ( 1 == (ud%4)) && (ordinal < 10))
+		  if((0 != cDigit) && 
+                     ( (1 != cur) || (1 != (ud%4)) || ( ordinal > 10)) )
 			 buf[--idx] = cDigit;
 
 		  c10kUnit =  0;
diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp
index 1e89f31a704..63609ffae77 100644
--- a/mozilla/layout/html/base/src/nsBulletFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp
@@ -429,7 +429,8 @@ static void CJKIdeographicToText(PRInt32 ordinal, nsString& result,
 			 buf[--idx] = c10kUnit;
 		  if(0 != cUnit)
 			 buf[--idx] = cUnit;
-		  if((0 != cDigit) && ( 1 == (ud%4)) && (ordinal < 10))
+		  if((0 != cDigit) && 
+                     ( (1 != cur) || (1 != (ud%4)) || ( ordinal > 10)) )
 			 buf[--idx] = cDigit;
 
 		  c10kUnit =  0;