commit 7e5e7cb8d4e44bbb9c15051467c57188296bd85d Merge: 977b5ff 0f300de Author: David Shea <dshea at redhat.com> Date: Tue Jan 13 10:56:20 2015 -0500 Merge branch 'master' into f21 Empty commit to get master and f21 on the same page again ---