Adding macosx and hmailserver options. presets also include mercury, but it

is not used in any $imap_server_type tests

plugins/administrator/defines.php

@@ -104,6 +104,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                                    'uw' => _("University of Washington's IMAP server"),
                                                                    'exchange' => _("Microsoft Exchange IMAP server"),
                                                                    'courier' => _("Courier IMAP server"),
+                                                                   'macosx' => _("Mac OS X Mailserver"),
+                                                                   'hmailserver' => _("hMailServer IMAP server"),
                                                                    'other' => _("Not one of the above servers") ) ),
                  '$optional_delimiter' => array( 'name' => _("IMAP Folder Delimiter"),
                                                  'type' => SMOPT_TYPE_STRING,