TAG HEAD merge 6 Aug 06 completed