[git/f14/master: 3/3] Merge remote branch 'origin/master' into f14

[Adam Tkac]

commit 3a27ad03e3c46674560ba663893625ae2e18ab63
Merge: 6195eb9 0114f57
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Sep 30 13:44:34 2010 +0200

    Merge remote branch 'origin/master' into f14
    
    Conflicts:
    	git.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore |    1 +
 git.spec   |    7 +++++--
 sources    |    3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc git.spec
index 761e440,69c989d..aa328a9
--- a/git.spec
+++ b/git.spec
@@@ -454,7 -454,10 +454,10 @@@ rm -rf %{buildroot
  # No files for you!
  
  %changelog
+ * Thu Sep 30 2010 Adam Tkac <atkac redhat com> - 1.7.3.1-1
+ - update to 1.7.3.1
+ 
 -* Wed Sep 29 2010 jkeating - 1.7.3-3
 +* Wed Sep 29 2010 jkeating - 1.7.3-2.1
  - Rebuilt for gcc bug 634757
  
  * Mon Sep 20 2010 Todd Zullinger <tmz at pobox.com> - 1.7.3-2