commit 0b9d25edcab65a9585bcdc7cda298f69ddac761d Merge: 569f279 33d9870 Author: sagitter <anto.trande at gmail.com> Date: Mon Mar 25 20:07:18 2013 +0100 Merge branch 'master' into el6 ---