commit 2270f43c6aa1ab6c9f7b1ed077d63b680cfaf229 Merge: 996241c 92a0736 Author: Tim Waugh <twaugh at redhat.com> Date: Mon Aug 2 12:24:08 2010 +0100 Merge branch 'f13' into f14 ---