commit 228de358c7bdd2451843b70a8786094e77510937 Merge: 0fd1a9e c3bf860 Author: Richard Fearn <richardfearn at gmail.com> Date: Sat Oct 9 21:09:11 2010 +0100 Merge branch 'el6' into el5 ---