[git/f12/master: 22/22] Merge remote branch 'origin/master' into f12

[Adam Tkac]

commit 087d36292a8b3fb0abbd3fd3315d9bc3325305da
Merge: a837145 71a8c91
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 11:12:38 2010 +0200

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

 .gitignore |    2 +-
 git.spec   |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 1dd8967,51ec344..ade54be
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--git-1.7.2.1.tar.bz2
 -/git-1.7.2.2.tar.bz2
++git-1.7.2.2.tar.bz2