[eclipse-mylyn-commons: 2/2] Merge branch 'f17'

[Krzysztof Daniel]

commit c70d2dbf3dd5428e0841e2d4eb125d182fcdc4cd
Merge: 26c7877 5aad1c1
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Apr 19 14:13:44 2012 +0200

    Merge branch 'f17'
    
    Conflicts:
    	eclipse-mylyn-commons.spec

 eclipse-mylyn-commons.spec |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)
---
diff --cc eclipse-mylyn-commons.spec
index 957e77c,2414de4..bcb2229
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@@ -173,6 -174,6 +174,9 @@@ unzip -q -o -d %{buildroot}%{install_lo
   build/rpmBuild/org.eclipse.mylyn.commons.compatibility.zip
  
  unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
++ build/rpmBuild/org.eclipse.mylyn.commons.compatibility.zip
++
++unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
   build/rpmBuild/org.eclipse.mylyn.commons.identity.zip
  
  unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \