diff --git a/mozilla/layout/html/base/src/nsBodyFrame.cpp b/mozilla/layout/html/base/src/nsBodyFrame.cpp
index fcf325a800c..cceb5590b7d 100644
--- a/mozilla/layout/html/base/src/nsBodyFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBodyFrame.cpp
@@ -73,7 +73,7 @@ nsBodyFrame::~nsBodyFrame()
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// nsIUnknown
+// nsISupports
 
 nsresult
 nsBodyFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
@@ -87,7 +87,7 @@ nsBodyFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
     *aInstancePtr = (void*) tmp;
     return NS_OK;
   }
-  return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr);
+  return nsBlockFrame::QueryInterface(aIID, aInstancePtr);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -104,11 +104,12 @@ NS_IMETHODIMP
 nsBodyFrame::GetAdditionalChildListName(PRInt32   aIndex,
                                         nsIAtom*& aListName) const
 {
-  if (aIndex < 0) {
-    return NS_ERROR_INVALID_ARG;
+  if (aIndex < 2) {
+    return nsBlockFrame::GetAdditionalChildListName(aIndex, aListName);
   }
+  
   nsIAtom* atom = nsnull;
-  if (0 == aIndex) {
+  if (2 == aIndex) {
     atom = gAbsoluteAtom;
     NS_ADDREF(atom);
   }
diff --git a/mozilla/layout/html/base/src/nsBodyFrame.h b/mozilla/layout/html/base/src/nsBodyFrame.h
index 467063666c8..03a7d3a3843 100644
--- a/mozilla/layout/html/base/src/nsBodyFrame.h
+++ b/mozilla/layout/html/base/src/nsBodyFrame.h
@@ -35,8 +35,10 @@ public:
   friend nsresult NS_NewBodyFrame(nsIContent* aContent, nsIFrame* aParent,
                                   nsIFrame*& aResult, PRUint32 aFlags);
 
+  // nsISupports
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
+  // nsIFrame
   NS_IMETHOD DeleteFrame(nsIPresContext& aPresContext);
 
   NS_IMETHOD GetAdditionalChildListName(PRInt32   aIndex,