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

Conflicts:
	git.spec

.gitignore

@@ -5,3 +5,4 @@
 /git-*/
 /git-1.7.6.4.tar.gz
 /git-1.7.7.tar.gz
+/git-1.7.7.1.tar.gz

git.spec

@@ -68,8 +68,8 @@
 %endif
 
 Name:           git
-Version:        1.7.7
-Release:        2%{?dist}
+Version:        1.7.7.1
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -531,6 +531,9 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Tue Nov 01 2011 Adam Tkac <atkac redhat com> - 1.7.7.1-1
+- update to 1.7.7.1
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.7-2
 - Rebuilt for glibc bug#747377
 

sources

@@ -1 +1 @@
-5d645884e688921e773186783b65ce33  git-1.7.7.tar.gz
+7cfb3e7ea585037272a7ad8e35f4ac0a  git-1.7.7.1.tar.gz