commit b08f58374550c559e0d5e847834d771c910b9030 Merge: b251f66 8afc1d6 Author: Paul Howarth <paul at city-fan.org> Date: Tue Jan 11 19:32:26 2011 +0000 Merge branch 'el5' into el4 Conflicts: .gitignore ---