commit 3a05ff033604c8c40c03cf60e60fe5bf3d97fba8 Merge: 9596eb6 83da6a7 Author: Tim Waugh <twaugh at redhat.com> Date: Mon Aug 2 16:27:27 2010 +0100 Merge branch 'f12' into f13 ---