merge trunk

diff --cc lisp/ChangeLog
index 41492031d8280e4a229252cee1c040250a3af054,e302160bd1f52df4f56b166f81096fd97cd97c67..720b9595569174ccef4b6d5dbb8aecae8f81e605
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,20 +1,25 @@@
 +2010-08-10  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the
 +      composable pattern.
 +
+ 2010-08-09  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * emacs-lisp/package.el (package-version-split)
+       (package--version-first-nonzero, package-version-compare):
+       Functions removed.
+       (package-directory-list, package-load-all-descriptors)
+       (package--built-in, package-activate, define-package)
+       (package-installed-p, package-compute-transaction)
+       (package-read-all-archive-contents)
+       (package--add-to-archive-contents, package-buffer-info)
+       (package-tar-file-info, package-list-packages-internal): Use
+       version-to-list and version-list-*.
+ 
+       * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
+       version-to-list.
+       (package-upload-buffer-internal): Use version-list-<=.
+ 
  2010-08-09  Kenichi Handa  <handa@m17n.org>
  
        * language/hebrew.el: Exclude U+05BD (Hebrew MAQAF) from the