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

[Alexander Kurtakov]

commit 1e47ef651ce80d5c9d3ff0712f3bf06ad307a63d
Merge: fa59f92 e229f4a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jul 2 13:59:23 2012 +0300

    Merge branch 'master' into f17

 .gitignore        |    1 +
 eclipse-egit.spec |   15 +++++++++------
 sources           |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---