commit 063dcb1b7d42488edb5e115fea67b652182ef052 Merge: 387e122 2b96cea Author: Mat Booth <mat.booth at redhat.com> Date: Thu Jun 19 08:58:23 2014 +0100 Merge remote-tracking branch 'origin/master' ---