commit db9689a9256e7c26147862e5532b4b6dbd778c40 Merge: b487933 49cc46b Author: Paul Howarth <paul at city-fan.org> Date: Mon Oct 18 12:10:26 2010 +0100 Merge branch 'origin/master' (early part) into f12/master ---