diff from 24148 and 86073

Description: The groupware suite
 Evolution is the integrated mail, calendar, task and address book distributed
 suite from Novell, Inc.
 .
 See http://www.novell.com/products/evolution/ for more
 information.
 .
 The following Base plugins 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
  - sa-junk-plugin
  - exchange-operations

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

--- 24148	Thu Jan  1 00:00:00 1970
+++ 86073	Thu Jan  1 00:00:00 1970
@@ -1,26 +1,29 @@
-The groupware suite
- Evolution is the integrated mail, calendar, task and address book distributed
- suite from Novell, Inc.
+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 Base plugins are included.
+ 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
-  - exchange-operations
+  - bogo-junk-plugin