commit b721dffe068eff5ba68d38e331143119388f8a74 Merge: 01bcde3 49cc46b Author: Paul Howarth <paul at city-fan.org> Date: Mon Oct 18 11:56:34 2010 +0100 Merge branch 'origin/master' (early part) into el6/master ---