commit 2d7fd8826b3f1ff9143bf891611f0451b0ea6f86 Merge: 65ba8e3 e417ed0 Author: Mark Chappell <tremble at tremble.org.uk> Date: Wed Sep 8 20:42:22 2010 +0200 Merge branch 'master' into el6 ---