commit b8d1184aa23e58eef3ac8569fa9274fe672f0287 Merge: 2f6f1fe d062d87 Author: Paul W. Frields <stickster at gmail.com> Date: Thu Feb 21 12:52:58 2013 +0100 Merge branch 'master' into el5 ---