[eclipse: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse

[Krzysztof Daniel]

commit acde2afabdacd72e756b54ecabbc66533d78511c
Merge: 62e715e 5110384
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Mar 29 15:19:19 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse
    
    Conflicts:
    	sources

 sources |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc sources
index e011402,e69de29..3dfdb67
--- a/sources
+++ b/sources
@@@ -1,2 -1,0 +1,2 @@@
 +c7b38987c8ce4a0e16d642fc6a12ef70  eclipse-build-9bf99aad0f4c76d5936616bd9612d6238b8468f0.tar.xz
- b91d8cad10530183e3e844ff1124c457  eclipse-4.2.0-fa15ab-src.tar.bz2
++b91d8cad10530183e3e844ff1124c457  eclipse-4.2.0-fa15ab-src.tar.bz2