commit 0a567ff3fa7663a89897b44ab7f1c6ff02a8ed51 Merge: e669f15 f875f77 Author: Michel Alexandre Salim <salimma at fedoraproject.org> Date: Sat Mar 12 17:15:26 2011 +0100 Merge commit 'f875f773a9380f7aa4d1b7ed55891a77ccfaf025' into el6 ---