commit e660387b31de66b235b86d85b844946f35f2926d Merge: 0e494a8 1658dfe Author: Jesse Keating <jkeating at redhat.com> Date: Mon Apr 9 15:40:08 2012 -0700 Merge remote-tracking branch 'origin/el6' ---