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

[jerboaa]

commit 0850da20056b8d4c3b6391ee1e299d50a198b760
Merge: 2ab7087 29e6e7a
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Apr 26 16:01:48 2012 -0400

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

 .gitignore        |    1 +
 eclipse-jgit.spec |   23 ++++++++++++++---------
 sources           |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)
---