merge

diff --cc lisp/ChangeLog
index e3c3455,085c082..84cfa2a
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
- 2010-01-24  Mark A. Hershberger  <mah@everybody.org>
++2010-01-25  Mark A. Hershberger  <mah@everybody.org>
 +
 +      * progmodes/python.el: Replace reference to obsolete
 +      c-subward-mode.
 +
 +      * vc-bzr.el: (vc-bzr-revision-table) New function.
 +
+ 2010-01-25  Eric Hanchrow  <eric.hanchrow@gmail.com>  (tiny change)
+ 
+       * vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the
+       diff-index command.  This requires at least git-1.5.5.  (Bug#1589).
+ 
  2010-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
  
        Remove support for adding --signoff on commit.