commit 9bbaefebfc6bf7f5f11fd0301d3fd02e13243e1d Merge: 20feaaf 14ed250 Author: Christopher Aillon <caillon at redhat.com> Date: Sun Mar 27 16:01:43 2011 -0700 Merge branch 'master' into f15 Conflicts: .gitignore sources totem.spec ---