commit f10cfdad08858771e860b3d035c9f135b0567309 Merge: 6e1579e 8f2f194 Author: Paul Howarth <paul at city-fan.org> Date: Fri Sep 10 10:27:21 2010 +0100 Merge branch 'master' into f13 ---