commit abc8d73ae8145166583e91065e8af5945a0fd2d6 Merge: 7f9b741 3b470f4 Author: Paul Howarth <paul at city-fan.org> Date: Thu Oct 7 12:48:00 2010 +0100 Merge branch 'origin/master' (early part) into f14/master ---