=== modified file 'lisp/emacs-lisp/package.el'
*** lisp/emacs-lisp/package.el	2010-08-26 03:31:34 +0000
--- lisp/emacs-lisp/package.el	2010-09-04 04:35:36 +0000
*************** packages in `package-directory-list'."
*** 260,266 ****
    ;; Defaults are subdirs named "elpa" in the site-lisp dirs.
    (let (result)
      (dolist (f load-path)
!       (if (equal (file-name-nondirectory f) "site-lisp")
  	  (push (expand-file-name "elpa" f) result)))
      (nreverse result))
    "List of additional directories containing Emacs Lisp packages.
--- 260,266 ----
    ;; Defaults are subdirs named "elpa" in the site-lisp dirs.
    (let (result)
      (dolist (f load-path)
!       (if (and f (equal (file-name-nondirectory f) "site-lisp"))
  	  (push (expand-file-name "elpa" f) result)))
      (nreverse result))
    "List of additional directories containing Emacs Lisp packages.