commit 83699d9d80ecdd8aef36f0c800bbdbeb48fe8a81 Merge: 3d91333 a7ee9b6 Author: Michel Alexandre Salim <salimma at fedoraproject.org> Date: Fri Jul 15 12:15:48 2011 +0200 Merge commit 'a7ee9b6e16f79439c9b5fc2e9f4baab8beef266e' into el6 ---