commit a4f5d2b3d36f4b8d2afdbd5995a7510b56613286 Merge: 011c09c beb0bca Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Oct 18 13:25:18 2012 -0500 Merge branch 'f18' into f17 ---