commit 68ec802ee656266f9d3546c73b15659bb13974b9 Merge: 1465edb 49cc46b Author: Paul Howarth <paul at city-fan.org> Date: Mon Oct 18 12:18:17 2010 +0100 Merge remote branch 'origin/master' into el4/master ---