Summary of changes: 2e07d21... * Fri Aug 13 2010 David Zeuthen <davidz at redhat.com> - 0.97- (*) c1967a3... fix a CK interaction bug (*) 86f7c65... Fix merge conflicts (*) c17d87e... rebuild (*) 3f5e8d3... Resolve merge conflicts (*) 3873214... 0.98 (*) This commit already existed in another branch; no separate mail sent