[git/el5/master: 115/115] Merge branch 'master' into el5

[Todd Zullinger]

commit c2f736a3e8d9991c0f196608f44a846daebf87da
Merge: 638c6f2 94ce6ac
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Feb 15 19:12:07 2011 -0500

    Merge branch 'master' into el5

 .gitignore                                         |    6 +-
 CVE-2008-5517.patch                                |   75 --
 git-1.5-gitweb-home-link.patch                     |    9 +-
 git-1.5.5.6-daemon-extra-args.patch                |  114 ---
 git-1.5.5.6-reflog-permissions.patch               |   28 -
 git-1.6-update-contrib-hooks-path.patch            |   43 ++
 git-1.7-el5-emacs-support.patch                    |  252 +++++++
 ...import-Ignore-cvsps-2.2b1-Branches-output.patch |   26 +
 git-gui.desktop                                    |    9 +
 git.conf.httpd                                     |    1 +
 git.spec                                           |  775 +++++++++++++++++---
 git.xinetd                                         |   16 -
 git.xinetd.in                                      |   14 +
 gitweb.conf.in                                     |   53 ++
 sources                                            |    2 +-
 15 files changed, 1069 insertions(+), 354 deletions(-)
---