[eclipse: 3/3] Merge branch 'master' of ssh://kdaniel at pkgs.fedoraproject.org/eclipse.git

[Krzysztof Daniel]

commit ccfdfc68c65884a1d8b100e8017f4654c3a6c3d8
Merge: 182f722 adf24f2
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Apr 18 18:38:54 2012 +0200

    Merge branch 'master' of
    ssh://kdaniel@pkgs.fedoraproject.org/eclipse.git
    
    Conflicts:
    	eclipse.spec

 eclipse.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc eclipse.spec
index b53bfaa,74bc9d4..e3e7e6b
--- a/eclipse.spec
+++ b/eclipse.spec
@@@ -656,11 -652,9 +656,14 @@@ rm -rf %{_bindir}/efj
  %{_libdir}/%{name}/dropins/sdk
  
  %changelog
 +* Wed Apr 18 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.13.I201204171000
 +- Move to the latest upstream I-build
 +- Generate full documentation.
 +- Formalize requirement on geronimo.
 +
+ * Wed Apr 18 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:4.2.0-0.12.I201204051114
+ - Don't fail if icon.xpm does not exist.
+ 
  * Thu Apr 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.11.I201204051114
  - Version more requirements.
  - Move java requirement to the lowest-in-stack package.