commit 059cd6854af8541d38515283e82a96d150ba5356 Merge: 5893884 e662df9 Author: Paul Howarth <paul at city-fan.org> Date: Sun Jan 22 20:08:37 2012 +0000 Merge branch 'el6' ---