commit 606c9da42620a598b77d69fc9b4d292db24a1394 Merge: 05114ee 9ad9825 Author: simonm <michal.simon at cern.ch> Date: Mon Sep 2 11:23:42 2013 +0200 Merge branch 'master' into el6 ---