commit ce3d18c583a37f43c68dcb410bd71f36eff31ea6 Merge: be07125 eac7b83 Author: Tim Waugh <twaugh at redhat.com> Date: Thu Aug 12 12:20:49 2010 +0100 Merge branch 'f13' into f14 ---