[eclipse-subclipse/f15: 2/2] Merge branch 'master' into f15

[Alexander Kurtakov]

commit 49d031fd7e8eba1ad3528427ded1b8c42b659479
Merge: 5362f03 f96abc4
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 12 11:59:55 2011 +0300

    Merge branch 'master' into f15

 .gitignore                                 |    1 +
 eclipse-subclipse-1.6.0-dependencies.patch |    2 +-
 eclipse-subclipse.spec                     |   12 ++++++------
 sources                                    |    2 +-
 subclipse-fetch.sh                         |    2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)
---