commit 5a6cf9a52a0faa861b34a94386d24942b85fa0ae Merge: 0f499c9 b4127b4 Author: Paul Howarth <paul at city-fan.org> Date: Thu Aug 26 10:43:20 2010 +0100 Merge commit 'b4127b4e61bb2c80d1a99a77cc80a33aa13c13ad' into el6 ---