[compiz/f15/master: 2/2] Merge commit '2d848521313f26a5a60225a8b090ac82498a1dcb' into f15

[Adam Williamson]

commit fc7fc2f9fda27b1f9dabd33a39567ba137baa65d
Merge: b9d30f4 2d84852
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Mar 28 20:27:46 2011 -0700

    Merge commit '2d848521313f26a5a60225a8b090ac82498a1dcb' into f15

 compiz-gnome.desktop |    5 ++---
 compiz-gnome.session |   11 +++++------
 compiz.spec          |    5 ++++-
 3 files changed, 11 insertions(+), 10 deletions(-)
---