MergeInfoEnhancer error when used with a multiple-project repository layout

[Frank]

When I make a branch from calc/trunk revision 4 to calc/branches/branch1 and look at the revision tree I get the error:

No node trunk at revision 4

In the MergeInfoEnhancer class (line 60 of enhancer.py) the branch.source() sets spath to "trunk". I expected it would be set to "calc/trunk". If I manually set it to "calc/trunk", I get a nice graph.

Settings and software versions I have

trac.ini

[revtree]
abstime = True
branch_re = ^(?P<branch>[^/]+/(?:(?:tags|branches)/[^/]+|trunk))(?:/(?P<path>.*))?$
contexts =
revbase = 1
scale = 1.0
style = compact
trunks = calc/trunk

PACKAGE = TracRevtreePlugin
VERSION = 0.6.3

PACKAGE = TracRevtreeMergeInfoEnhancer
VERSION = 0.2.1

Trac:	0.11.1
Python:	2.5.2 (r252:60911, Jan 4 2009, 18:00:02) [GCC 4.3.2]
setuptools:	0.6c8
SQLite:	3.5.9
pysqlite:	2.4.1
Genshi:	0.5.1
mod_python:	3.3.1
Pygments:	0.10
Subversion:	1.5.1 (r32289)
jQuery:	1.2.6