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

[jerboaa]

commit ea6b9079ef7e2903fd2136db8546cb50a3f2821d
Merge: 0850da2 d3cbd39
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Fri Apr 27 10:10:21 2012 -0400

    Merge branch 'master' into f17

 eclipse-jgit.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---