diff --git a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
index 63a98f3aaca..590aeb0ef3d 100644
--- a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
@@ -177,7 +177,7 @@ nsITokenRecycler* nsHTMLTokenizer::GetTokenRecycler(void) {
  * @return  ptr to token
  */
 CToken* nsHTMLTokenizer::PeekToken() {
-  return (CToken*)mTokenDeque.Peek();
+  return (CToken*)mTokenDeque.PeekFront();
 }
 
 
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
index 6f7f2b5b5a6..d2d48b40d37 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -359,7 +359,7 @@ nsStreamConverterService::FindConverter(const char *aProgID, nsCStringArray **aE
     // Now generate the shortest path tree.
     grayQ->Push(source);
     while (0 < grayQ->GetSize()) {
-        nsHashKey *currentHead = (nsHashKey*)grayQ->Peek();
+        nsHashKey *currentHead = (nsHashKey*)grayQ->PeekFront();
         SCTableData *data2 = (SCTableData*)mAdjacencyList->Get(currentHead);
         if (!data2) return NS_ERROR_FAILURE;
         nsVoidArray *edges = (nsVoidArray*)data2->data;
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
index 63a98f3aaca..590aeb0ef3d 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -177,7 +177,7 @@ nsITokenRecycler* nsHTMLTokenizer::GetTokenRecycler(void) {
  * @return  ptr to token
  */
 CToken* nsHTMLTokenizer::PeekToken() {
-  return (CToken*)mTokenDeque.Peek();
+  return (CToken*)mTokenDeque.PeekFront();
 }
 
 
diff --git a/mozilla/xpcom/ds/nsDeque.cpp b/mozilla/xpcom/ds/nsDeque.cpp
index c9bc186ba80..ade76770da4 100644
--- a/mozilla/xpcom/ds/nsDeque.cpp
+++ b/mozilla/xpcom/ds/nsDeque.cpp
@@ -248,16 +248,32 @@ void* nsDeque::PopFront() {
   }
   return result;
 }
+/**
+ * This method gets called you want to peek at the bottom
+ * member without removing it.
+ *
+ * @update	sford 11/25/99
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::Peek() {
+	void* result=0;
+	if(mSize>0) {
+		int offset=mOrigin+mSize-1;	
+		result=mData[offset];
+	}
+	return result;
+}	
 
 /**
  * This method gets called you want to peek at the topmost
  * member without removing it.
  *
- * @update	gess4/18/98
+ * @update  sford 11/25/99	
  * @param   nada
  * @return  last item in container
  */
-void* nsDeque::Peek() {
+void* nsDeque::PeekFront() {
   void* result=0;
   if(mSize>0) {
     result=mData[mOrigin];
diff --git a/mozilla/xpcom/ds/nsDeque.h b/mozilla/xpcom/ds/nsDeque.h
index 79226775cca..4c32fc209e4 100644
--- a/mozilla/xpcom/ds/nsDeque.h
+++ b/mozilla/xpcom/ds/nsDeque.h
@@ -124,15 +124,23 @@ friend class nsDequeIterator;
    */
   void* PopFront(void);
 
- 
+  /**
+  	* Return bottom item  without removing it.
+  	*
+  	* @update	sford11/25/99
+  	* @param	none
+  	* @return ptr to first item in container
+  	*/
+  	
+  void* Peek(void);
   /**
    * Return topmost item without removing it.
    * 
-   * @update	gess4/18/98
+   * @update	sford 11/25/99	
    * @param   none
    * @return  ptr to first item in container
    */
-  void* Peek(void);
+  void* PeekFront(void);
   
   /**
    * method used to retrieve ptr to