Summary of changes: c2842a1... fix a CK interaction bug (*) e48a851... Fix merge conflicts (*) a98bb71... * Fri Aug 20 2010 David Zeuthen <davidz at redhat.com> - 0.98- (*) 3f5e8d3... Resolve merge conflicts (*) This commit already existed in another branch; no separate mail sent