cvsps_import fails with cvsps 2.2

Basically, it looks like cvsps-import doesn't support the new "Branches: " line in cvsps 2.2. With the latest trunk checkout of cvsps-import and cvsps 2.2b1, I get:

AssertionError: Failed to process: 'Branches: \n'

Here are some steps to reproduce:

1) Install cvsps 2.2
2) rsync -av --include="/mozilla/webtools" --exclude="/mozilla/*" --include="/mozilla/webtools/bugzilla" --exclude="/mozilla/webtools/*" cvs-mirror.mozilla.org::mozilla mozilla-cvs
3) CVSROOT=`pwd`/mozilla-cvs/ bzr cvsps-import mozilla-cvs mozilla/webtools/bugzilla bugzilla-import

And for me, that produces the following stack trace:

bzr: ERROR: exceptions.AssertionError: Failed to process: 'Branches: \n'

Traceback (most recent call last):
  File "/usr/lib64/python2.6/site-packages/bzrlib/commands.py", line 835, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib64/python2.6/site-packages/bzrlib/commands.py", line 1030, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib64/python2.6/site-packages/bzrlib/commands.py", line 647, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/cvsps_import/__init__.py", line 95, in run
    importer.process()
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 1272, in process
    patchsets = self._parse_cvsps_dump(pb=pb)
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/cvsps_import/cvsps/importer.py", line 1205, in _parse_cvsps_dump
    patchsets = parser.parse(pb=pb)
  File "/usr/lib/python2.6/site-packages/bzrlib/plugins/cvsps_import/cvsps/parser.py", line 262, in parse
    assert False, 'Failed to process: %r' % (line,)
AssertionError: Failed to process: 'Branches: \n'

bzr 1.17 on python 2.6 (linux2)
arguments: ['/usr/bin/bzr', 'cvsps-import', 'mozilla-cvs', 'mozilla/webtools/bugzilla', 'bugzilla-import']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  cvsps_import /usr/lib/python2.6/site-packages/bzrlib/plugins/cvsps_import [unknown]
  launchpad /usr/lib64/python2.6/site-packages/bzrlib/plugins/launchpad [1.17]
  netrc_credential_store /usr/lib64/python2.6/site-packages/bzrlib/plugins/netrc_credential_store [1.17]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.