commit cf02dbaf2afd9cf28d3bebc802e96879a41bb4ba Merge: 38f32b4 51e61bb Author: James Laska <jlaska at redhat.com> Date: Fri Jul 8 15:31:16 2011 -0400 Merge remote-tracking branch 'origin/el5' into el6 ---