commit 383c9a87a7b2c96bf9cdb9e3ebefeff67a13a37f Merge: 0fae297 bbcf3c6 Author: Tim Waugh <twaugh at redhat.com> Date: Fri Jun 14 12:38:51 2013 +0100 Merge branch 'f18' into f19 ---