commit adbbaf7d7d52445ddc12ac63e4d9a5a3ed3d5a48 Merge: 457e560 49cc46b Author: Paul Howarth <paul at city-fan.org> Date: Mon Oct 18 12:07:52 2010 +0100 Merge branch 'origin/master' (early part) into f13/master ---