commit 998a044e7352ac1c07440e5cf653adee94d9dd7e Merge: 8e8f029 9a9db3c Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Oct 18 13:18:30 2012 -0500 Merge branch 'f18' into f17 ---