Logged In: YES 
user_id=33168

Paul, thanks for taking this up.  I made very little
progress on this  I have attached my version of the diffs.

I had some problems with the original patch which I was
never able to correct.  For example, I think it was not
possible to run python from a local build env't.  It
appeared that python had to be installed for everything to
work.  See the problem in bug 586680 (also in site.py). 
That should probably be addressed and was part of my problem.

I tried to simplify the code some, so you should see some
differences between the patch I attached and the original. 
These are not as important as making the patch work
properly, both when installed and running from a build env't.

I will try to take a look at your problem later, but it may
take a while.  Let me know if you make progress.