diff --git a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
index ae9f51813aa..5935e2297be 100644
--- a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
+++ b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
@@ -2438,6 +2438,9 @@ nsComputedDOMStyle::GetStaticOffset(PRUint8 aSide, nsIFrame* aFrame,
       case eStyleUnit_Percent:
         val->SetPercent(coord.GetPercentValue());
         break;
+      case eStyleUnit_Auto:
+        val->SetString(NS_LITERAL_STRING("auto"));
+        break;
       default:
         NS_WARNING("double check the unit");
         val->SetTwips(0);
diff --git a/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.js b/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.js
index 30f4f037d10..dddb597227e 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.js
+++ b/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.js
@@ -154,10 +154,6 @@ function(aRow, aColId)
     // implemented properly, and trying to fetch them results in
     // a hailstorm of assertions.
     switch (prop) {
-      case "left":
-      case "right":
-      case "top":
-      case "bottom":
       case "-moz-outline-width":
       case "marker-offset":
         return "";
diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp
index ae9f51813aa..5935e2297be 100644
--- a/mozilla/layout/style/nsComputedDOMStyle.cpp
+++ b/mozilla/layout/style/nsComputedDOMStyle.cpp
@@ -2438,6 +2438,9 @@ nsComputedDOMStyle::GetStaticOffset(PRUint8 aSide, nsIFrame* aFrame,
       case eStyleUnit_Percent:
         val->SetPercent(coord.GetPercentValue());
         break;
+      case eStyleUnit_Auto:
+        val->SetString(NS_LITERAL_STRING("auto"));
+        break;
       default:
         NS_WARNING("double check the unit");
         val->SetTwips(0);