commit c3bf8600efe411d85b35a02f4c60aa2b60fedbf6 Merge: 5606a77 b1d91b8 Author: Richard Fearn <richardfearn at gmail.com> Date: Sat Oct 9 21:07:04 2010 +0100 Merge branch 'master' into el6 ---