commit 2755193fbe6df87ed274c3b385e1b45a36fdaa96 Merge: 7a0ea9c 7f3ff15 Author: Paul Howarth <paul at city-fan.org> Date: Thu Oct 27 07:36:40 2011 +0100 Merge branch 'master' into f16 ---