It looks a bit better like this:
Woking - McLaren (1996)
Brackley – Tyrrell, BAR (3 years 1997-8)
Enstone - Benetton (3 years 1999-2001)
Milton Keynes – Jaguar, Red Bull Racing (6 years 2002-2007)
Brackley – Honda, Brawn (2 years 2008-09)
Advisory roles at Hispania (2010) & Marussia (2011)
Returns to F1 full time with Ferrari in 2011.
Finally, F1 is a small incestuous world and people do tend move around a bit more than you'd expect in a normal industry. For example if you have a problem with wind tunnel calibration you poach the person in the paddock with the reputation for getting wind tunnels sorted. Once he's fixed that problem and getting a bit bored by routine, he's then poached by the next team with a wind tunnel problem.
I recall there's a chap mentioned in another thread who hopped between two teams several times on a 2 or 3 year cycle.