commit 5f49de491d1ec18e59429c4efa9443e13b1cf696 Merge: 2638318 f495c28 Author: Michel Alexandre Salim <salimma at fedoraproject.org> Date: Fri Jul 15 11:00:14 2011 +0200 Merge commit 'f495c28598e3168a64874f805b652d3bb6094016' into el5 ---