commit 92a0736e013f599d35640a47d289bc71031322ae Merge: fde4161 4257a95 Author: Tim Waugh <twaugh at redhat.com> Date: Mon Aug 2 12:23:29 2010 +0100 Merge branch 'f12' into f13 ---