[eclipse-egit/f17: 3/3] Merge branch 'master' into f17

[jerboaa]

commit ad893f129bede4026c9751e40cef065bff364611
Merge: fc16f0f c40a5d2
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Apr 26 15:55:41 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	eclipse-egit.spec
    	sources

 sources |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc sources
index 1659401,22042db..6add1f1
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 -2cf4ea1bc84b3afa5b67f0600f358ca5  egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
 +89ac7482fecbdcfc73369360290ab719  egit-1.3.0.201202151440-r.tar.bz2
++