from trunk

diff --cc lisp/ChangeLog
index ccafaf81928bf6a8d2f0f8bc27168a13247bbb59,f9f748f751da17baf8a429310211bd304bde89f9..95410b9393ab8fdc00bbd7a2c30280092ca90efd
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
 +2010-01-08  Kenichi Handa  <handa@m17n.org>
 +
 +      * international/fontset.el (build-default-fontset-data): Exclude
 +      characters in scripts kana, hangul, han, or cjk-misc.
 +
+ 2010-01-07  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename
+       to `create-file-buffer' as it expects, not just a buffer name.
+       (vc-dir-mode): Include the buffer name in `list-buffers-directory',
+       to help uniquify.  (Bug#3224)
+ 
  2010-01-06  Jan Djärv  <jan.h.d@swipnet.se>
  
        * font-setting.el (font-setting-change-default-font): Use user-spec