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

[jerboaa]

commit fa59f92766b83bb0101d0ca97c7fc2107d668509
Merge: 87ccf9f 6f003fe
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Fri Apr 27 09:48:22 2012 -0400

    Merge branch 'master' into f17

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