[compiz-fusion-extras/f15/master: 2/2] Merge commit '657f642794bb52372f2896bba48e852c70804c89' into f15

[Adam Williamson]

commit e915c581e414d7c73f1deca46b1a46d72718a515
Merge: 2b71b36 657f642
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Mar 23 18:17:30 2011 -0700

    Merge commit '657f642794bb52372f2896bba48e852c70804c89' into f15

 .gitignore                |    1 +
 compiz-fusion-extras.spec |    9 ++++++---
 sources                   |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---