Changes that should be applied to Kolab 2.1 branch

diff --git a/kolabd/kolabd/kolabd.spec.in b/kolabd/kolabd/kolabd.spec.in
--- a/kolabd/kolabd/kolabd.spec.in
+++ b/kolabd/kolabd/kolabd.spec.in
@@ -25,9 +25,8 @@
 ##
 
 #   package version
-%define       V_ei_maj 2.0
-%define       V_ei_min 99
-%define       V_cf     1.0.4
+%define       V_ei_maj 2.1
+%define       V_ei_min 0
 
 #   package information
 Name:         kolabd
@@ -71,11 +70,6 @@ AutoReqProv:  no
     In addition it is a robust and flexible general IMAP mail server 
     with LDAP addressbooks.
     Kolab %{V_ei_maj}.%{V_ei_min}
-
-    The Code Fusion fork adds functionality such as integration with
-    Active Directory, a more modularised backend, separation of the
-    daemon and the configuration generator and more.
-    Code Fusion Engine %{V_cf}, shares Admin (see above)
 
 %track
     prog kolab-ei = {