donb
committed
on 13 Jul 07
Hacked this to work with the new master template scheme. This is only a
temporary solution (see my comments in the code for details)