commit b67a4a7aa8ad6b3d7b2344aa71fa88ee82a4232a
Merge: 36c1fd1 5da92bd
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Wed Jun 13 16:12:48 2012 -0700
Merge branch 'el6'
Merge the last branch that predates dist-git to make branch syncing
easier.
---