Removed tim's branch. Tim can work in the trunk from now on, and is now officialy A Cool Guy (tm) :-)