[compiz-plugins-main/f15/master: 3/3] Merge commit '4e6d67c24b62fe62c1c1f52ee09e9e2d5ccee142' into f15

[Adam Williamson]

commit 2bea45f951e5aaeeb006c8d8e505bd87621ce72b
Merge: da0faeb 4e6d67c
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Mar 23 12:04:30 2011 -0700

    Merge commit '4e6d67c24b62fe62c1c1f52ee09e9e2d5ccee142' into f15

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