commit d42810d868291742c8506d8ea0fa979c8314777f Merge: 2664dae 3a05ff0 Author: Tim Waugh <twaugh at redhat.com> Date: Mon Aug 2 16:27:38 2010 +0100 Merge branch 'f13' into f14 ---