commit 9851ff8c039efe8f9f11ad3a6b000f01b8e42c0b Merge: 49a7508 6d21536 Author: Tim Waugh <twaugh at redhat.com> Date: Tue Sep 11 12:23:53 2012 +0100 Merge branch 'f16' into f17 ---