commit 0793d26f61eeb4efea9adabe1d06b89a6c14129f Merge: 1a6f5e3 14cf91e Author: Michal Schmidt <mschmidt at redhat.com> Date: Fri Mar 15 11:40:35 2013 +0100 Merge branch 'master' into f19 ---