recent refactoring removed send_text_and_attachment_email

bzr: ERROR: exceptions.AttributeError: 'SMTPConnection' object has no attribute 'send_text_and_attachment_email'

Traceback (most recent call last):
  File "/home/vila/src/bzr/trunk/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/commands.py", line 1141, in run_bzr
    ret = run(*run_argv)
  File "/home/vila/src/bzr/trunk/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/vila/src/bzr/trunk/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/builtins.py", line 3689, in run
    lossy=lossy)
  File "/home/vila/src/bzr/trunk/bzrlib/decorators.py", line 218, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/workingtree_4.py", line 218, in commit
    result = WorkingTree.commit(self, message, revprops, *args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/decorators.py", line 218, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/mutabletree.py", line 211, in commit
    *args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/commit.py", line 290, in commit
    lossy=lossy)
  File "/home/vila/src/bzr/trunk/bzrlib/cleanup.py", line 132, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/vila/src/bzr/trunk/bzrlib/commit.py", line 465, in _commit
    self._process_post_hooks(old_revno, new_revno)
  File "/home/vila/src/bzr/trunk/bzrlib/commit.py", line 619, in _process_post_hooks
    self._process_hooks("post_commit", old_revno, new_revno)
  File "/home/vila/src/bzr/trunk/bzrlib/commit.py", line 658, in _process_hooks
    self.rev_id)
  File "/home/vila/.bazaar/plugins/email/__init__.py", line 86, in branch_commit_hook
    local_branch=local).send_maybe()
  File "/home/vila/.bazaar/plugins/email/emailer.py", line 267, in send_maybe
    self.send()
  File "/home/vila/.bazaar/plugins/email/emailer.py", line 206, in send
    self._send_using_smtplib()
  File "/home/vila/.bazaar/plugins/email/emailer.py", line 247, in _send_using_smtplib
    smtp.send_text_and_attachment_email(from_addr, to_addrs,
AttributeError: 'SMTPConnection' object has no attribute 'send_text_and_attachment_email'

bzr 2.6.0dev2 on python 2.7.3 (Linux-3.2.0-24-generic-x86_64-with-
    Ubuntu-12.04-precise)
arguments: ['/home/vila/bin/bzr', '--no-aliases', 'commit', '--verbose', '--
    file', '/home/vila/my/admin/.tmp-bzr-log-edit.txt']
plugins: bash_completion[2.6.0dev2], bisect[1.1.0dev], bookmarks[2.3.0dev],
    builddeb[2.7.0dev], builder[unknown], bzrtools[2.5.0],
    changelog_merge[2.6.0dev2], defaultToUrllib[unknown], diffstat[0.2.0],
    email[unknown], explorer[1.2.1], gardener[1.0.0dev], git[0.6.9dev],
    gpgfilter[unknown], graph[1.0.0], grep[0.5.0dev], gtk[0.104.0dev],
    guess[unknown], hg[0.2.0dev], launchpad[2.6.0dev2],
    local_test_server[unknown], loom[2.2.1dev],
    netrc_credential_store[2.6.0dev2], news_merge[2.6.0dev2],
    po_merge[2.6.0dev2], pqm[1.4.0dev], qbzr[0.23.0dev], rewrite[0.6.2dev],
    stats[0.1.0dev], svn[1.2.2dev], tiplog[0.0.1dev],
    update_copyright[0.1.0dev], upload[1.2.0dev], weave_fmt[2.6.0dev2],
    webdav[2.5.0], wikkid[unknown], xmloutput[0.8.8]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.