Merged revisions 309255 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r309255 | qwell | 2011-03-02 13:53:47 -0600 (Wed, 02 Mar 2011) | 8 lines
  
  Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP.
  
  Since it's a duplicate, nothing is going to be done, so delme doesn't need to
  be set at all.  Strangely, when this was added, this was being set to 1 in 1.6,
  and 0 in trunk.
  
  (issue AST-439)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@309256 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

@@ -25826,7 +25826,6 @@ static void add_peer_mailboxes(struct sip_peer *peer, const char *value)
 		AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) {
 			if (!strcmp(mailbox->mailbox, mbox) && !strcmp(S_OR(mailbox->context, ""), S_OR(context, ""))) {
 				duplicate = 1;
-				mailbox->delme = 0;
 				break;
 			}
 		}