[eclipse-emf/f17: 7/7] Picked up 4.2 compatible emf builds.

[Krzysztof Daniel]

commit 7839b8af7038e36252e3349ba047520f3562bb18
Merge: ef2ee7a d5b2343
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Apr 10 19:01:13 2012 +0200

    Picked up 4.2 compatible emf builds.
    
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	eclipse-emf.spec

 .gitignore       |    1 +
 eclipse-emf.spec |  113 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 68 insertions(+), 46 deletions(-)
---