*** /home/albinus/src/tramp/lisp/tramp.el.~2.757.~	2009-12-09 10:06:48.000000000 +0100
--- /home/albinus/src/tramp/lisp/tramp.el	2009-12-15 07:18:45.000000000 +0100
***************
*** 6562,6568 ****
  	  (delete-region begin (point))
  	  (goto-char (point-min)))))
  
!     (when (not (tramp-get-connection-property proc "check-remote-echo" nil))
        ;; No echo to be handled, now we can look for the regexp.
        (goto-char (point-min))
        (re-search-forward regexp nil t))))
--- 6562,6573 ----
  	  (delete-region begin (point))
  	  (goto-char (point-min)))))
  
!     (when (or (not (tramp-get-connection-property proc "check-remote-echo" nil))
! 	      ;; Sometimes, the echo string is suppressed on the remote side.
! 	      (not (string-equal
! 		    (substring-no-properties
! 		     tramp-echo-mark-marker 0 (min 5 (1- (point-max))))
! 		    (buffer-substring-no-properties 1 (min 6 (point-max))))))
        ;; No echo to be handled, now we can look for the regexp.
        (goto-char (point-min))
        (re-search-forward regexp nil t))))