diff from 72818 and 86073

Description: groupware suite with mail client and organizer
 Evolution is a groupware suite which integrates mail, calendar,
 address book, to-do list and memo tools.
 .
 Additional features include integration with Exchange and Groupwise
 servers, newsgroup client, LDAP support, web calendars and
 synchronization with Palm devices.
 .
 Evolution is a graphical application that is part of GNOME, and
 is distributed by Novell, Inc.
 .
 See http://www.novell.com/products/evolution/ for more
 information.
 .
 The following plugins belonging to the "base" set are included.
  - calendar-file
  - calendar-http
  - calendar-weather
  - itip-formatter
  - plugin-manager
  - default-source
  - addressbook-file
  - startup-wizard
  - print-message
  - mark-all-read
  - groupwise-features
  - groupwise-account-setup
  - hula-account-setup
  - mail-account-disable
  - publish-calendar
  - caldav
  - imap-features
  - google-account-setup
  - sa-junk-plugin
  - bogo-junk-plugin
  - mono

Description: groupware suite with mail client and organizer
 Evolution is a groupware suite which integrates mail, calendar,
 address book, to-do list and memo tools.
 .
 Additional features include integration with Exchange and Groupwise
 servers, newsgroup client, LDAP support and web calendars
 .
 Evolution is a graphical application that is part of GNOME, and
 is distributed by Novell, Inc.
 .
 See http://www.novell.com/products/evolution/ for more
 information.
 .
 The following plugins belonging to the "base" set are included.
  - calendar-file
  - calendar-http
  - itip-formatter
  - default-source
  - addressbook-file
  - mark-all-read
  - groupwise-features
  - publish-calendar
  - caldav
  - imap-features
  - google-account-setup
  - webdav-account-setup
  - calendar-weather
  - sa-junk-plugin
  - bogo-junk-plugin

--- 72818	Thu Jan  1 00:00:00 1970
+++ 86073	Thu Jan  1 00:00:00 1970
@@ -3,8 +3,7 @@
  address book, to-do list and memo tools.
  .
  Additional features include integration with Exchange and Groupwise
- servers, newsgroup client, LDAP support, web calendars and
- synchronization with Palm devices.
+ servers, newsgroup client, LDAP support and web calendars
  .
  Evolution is a graphical application that is part of GNOME, and
  is distributed by Novell, Inc.
@@ -15,22 +14,16 @@
  The following plugins belonging to the "base" set are included.
   - calendar-file
   - calendar-http
-  - calendar-weather
   - itip-formatter
-  - plugin-manager
   - default-source
   - addressbook-file
-  - startup-wizard
-  - print-message
   - mark-all-read
   - groupwise-features
-  - groupwise-account-setup
-  - hula-account-setup
-  - mail-account-disable
   - publish-calendar
   - caldav
   - imap-features
   - google-account-setup
+  - webdav-account-setup
+  - calendar-weather
   - sa-junk-plugin
   - bogo-junk-plugin
-  - mono