compiz: Changes to 'master'

[Danny Baumann]

 plugins/rotate.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e5784d997296ba35a825251ebddb00840aa634ed
Merge: 607e2e1afcd44de8c3e23a7bb39c27a5a28c02b8 55166c4f6b0ad4cbf42143b5d2d52af86f840e70
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Oct 15 16:05:28 2008 +0200

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

commit 607e2e1afcd44de8c3e23a7bb39c27a5a28c02b8
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Oct 15 16:05:05 2008 +0200

    We have 5 options, not 4.