commit a825ba3b72a5e4825c522f880ca68bd8b09078fe Merge: de85b9f a2eecbe Author: Garrett Holmstrom <gholms at fedoraproject.org> Date: Thu Jul 29 21:45:19 2010 -0500 Merge branch 'el6' into f13 ---