commit ec724cfbafac9e21dfadc3a148cebef0e1642bba Merge: bd76d78 bebecb6 Author: Joseph Marrero <jmarrero at fedoraproject.org> Date: Sun Oct 14 21:09:30 2012 +0000 Merge branch 'master' into f17 ---