[compizconfig-backend-kconfig4/f15/master: 2/2] Merge commit 'bc7863d93988117de80bf0fbbcd08f40ed4df17c' into f15

[Adam Williamson]

commit 5f6026067335425942dd1bd737d9b378dd357806
Merge: 8d6f225 bc7863d
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Mar 23 18:19:23 2011 -0700

    Merge commit 'bc7863d93988117de80bf0fbbcd08f40ed4df17c' into f15

 .gitignore                         |    1 +
 compizconfig-backend-kconfig4.spec |   11 +++++++----
 sources                            |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---