commit eac7b8397e4d933d4f2230215b65eeecdb9601a7 Merge: 18b48d7 de72625 Author: Tim Waugh <twaugh at redhat.com> Date: Thu Aug 12 12:20:15 2010 +0100 Merge branch 'f12' into f13 ---