diff from 24757 and 47489

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
  - 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, 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
  - exchange-operations
  - mono

--- 24757	Thu Jan  1 00:00:00 1970
+++ 47489	Thu Jan  1 00:00:00 1970
@@ -29,5 +29,9 @@
   - mail-account-disable
   - publish-calendar
   - caldav
+  - imap-features
+  - google-account-setup
   - sa-junk-plugin
+  - bogo-junk-plugin
   - exchange-operations
+  - mono