compiz: Changes to 'master'

[David Reveman]

 plugins/cube.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 060a34e9c20e487e7ccaec8af706e156d61c4906
Merge: 92e6e2f... 9a4705c...
Author: David Reveman <davidr at novell.com>
Date:   Fri May 11 11:23:36 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit 92e6e2f3b3e8b976df62afd9fcb65306651ed3a2
Author: David Reveman <davidr at novell.com>
Date:   Thu May 10 16:45:49 2007 -0400

    Have the adjust image option behave as when it was previously
    turned off and make the default behavior keep the image oriented
    the same all the time.