commit 24eba863eecc9db79e29df51df37ad5555706378 Merge: 541e5da 8f2f194 Author: Paul Howarth <paul at city-fan.org> Date: Fri Sep 10 10:28:37 2010 +0100 Merge branch 'master' into el6 ---