commit 0374f03fe420f38e72cf500b12ea5560f6ae4fd0 Merge: 31652dd 73593cf Author: Tim Waugh <twaugh at redhat.com> Date: Wed Aug 18 10:17:28 2010 +0100 Merge branch 'f13' into f14 ---