commit 7c4ef61dee8e914a7a793d1f7845642b83c9a799 Merge: f7ba85c 71b653c Author: Paul Howarth <paul at city-fan.org> Date: Thu Dec 9 18:00:46 2010 +0000 Merge branch 'master' into f13 ---