[compizconfig-backend-gconf/f15/master: 2/2] Merge commit '871f70d7742fe85dc7cd7fefd735f28f9a8327d1' into f15

[Adam Williamson]

commit a433735ffa9a1324cefa4b5ab3f35eebe594fd6a
Merge: b428734 871f70d
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Mar 23 18:18:39 2011 -0700

    Merge commit '871f70d7742fe85dc7cd7fefd735f28f9a8327d1' into f15

 .gitignore                      |    1 +
 compizconfig-backend-gconf.spec |   19 ++++++++-----------
 sources                         |    2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)
---