commit 4dd8f88a7cabdd2a6500b43e1cfb2135731aec23 Merge: 9c6e20f ab9d670 Author: Elio Maldonado Batiz <emaldona at redhat.com> Date: Tue Aug 28 09:06:29 2012 -0700 Merge branch 'master' into f18 ---