commit 2daa3ab01f4ab6a4b0b13c7f6632383a4f297eef Merge: 501f93b 179e1df Author: John Eckersberg <jeckersb at redhat.com> Date: Tue Oct 5 20:34:43 2010 -0400 Merge branch 'el6' into 0.7.x ---