unexpected keyword argument 'control'

In Ubuntu maverick, I'm getting the following exception with bzr-fastimport + fastimport from trunk:

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 912, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1112, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 690, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 705, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/niemeyer/.bazaar/plugins/fastimport/cmds.py", line 313, in run
    params=params, verbose=verbose, user_map=user_map)
  File "/home/niemeyer/.bazaar/plugins/fastimport/cmds.py", line 38, in _run
    proc = processor_factory(verbose=verbose, **kwargs)
TypeError: __init__() got an unexpected keyword argument 'control'