[compizconfig-python/f15/master: 4/4] Merge commit 'ccf744a7e70666ae7e287533685fca0c62270eb1' into f15

[Adam Williamson]

commit 59110a61a3ce2e2a9de8f7bbceaee5740341d14a
Merge: d6ed2a9 ccf744a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Mar 23 18:20:07 2011 -0700

    Merge commit 'ccf744a7e70666ae7e287533685fca0c62270eb1' into f15

 .gitignore                              |    1 +
 compizconfig-python-0.9.2.1-cinit.patch |   56 -------------------------------
 compizconfig-python.spec                |   18 ++++-----
 sources                                 |    2 +-
 4 files changed, 10 insertions(+), 67 deletions(-)
---