commit 839acd4116fd859a3dc5b33db09db78d0d115b21 Merge: 77d4982 bebecb6 Author: Joseph Marrero <jmarrero at fedoraproject.org> Date: Sun Oct 14 21:01:49 2012 +0000 Merge branch 'master' into f18 ---