commit 303884add8b1653f257e5b81ab25250350bb9e17 Merge: 5f13149 131a54a Author: Tim Waugh <twaugh at redhat.com> Date: Thu Jun 13 12:14:23 2013 +0100 Merge 'f18' into f19 ---