commit 87976b60d282cfc166f2d65ea23b838295220ae8 Merge: 6e518cb 85ea544 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Oct 18 13:15:19 2012 -0500 Merge branch 'f18' into f17 ---