[git/f14/master: 6/6] Merge remote-tracking branch 'origin/master' into f14

[Adam Tkac]

commit 25a2b5e0f9b0bcd6938698911c8ec14087161308
Merge: d9fd58e bba13f4
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Mar 28 16:43:27 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14

 .gitignore                      |    4 -
 git-1.7-el5-emacs-support.patch |  252 +++++++++++++++++++++++++++++++++++++++
 git.spec                        |   67 ++++++++---
 sources                         |    2 +-
 4 files changed, 304 insertions(+), 21 deletions(-)
---