commit 48d87742ea867ee9e723625a26a1377ff4ef5216 Merge: 38da7a3 6bfd7bb Author: Michel Alexandre Salim <salimma at fedoraproject.org> Date: Tue Nov 30 20:04:24 2010 +0100 Merge commit '6bfd7bb9912f28701f30c1ab0f9a26e7b0128376' into el6 ---