[clutter/msvc-support-master: 5/5] Merge branch 'master' into msvc-support-master

[Chun-wei Fan <fanchunwei src gnome org>]

commit e33a6219d8e4bf22725c9cf7ca5abee1936bd7fa
Merge: 8b5d255 8083dd5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Oct 18 15:48:17 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/clutter-actor.c                        |   14 ++--
 clutter/clutter-backend.c                      |    6 +-
 clutter/clutter-bezier.c                       |    2 +-
 clutter/clutter-debug.h                        |   27 +++----
 clutter/clutter-layout-manager.c               |  103 +++++++++++++++++-------
 clutter/clutter-main.c                         |    6 +-
 clutter/clutter-master-clock.c                 |    4 +-
 clutter/deprecated/clutter-behaviour-depth.c   |    2 +-
 clutter/deprecated/clutter-behaviour-ellipse.c |    2 +-
 clutter/deprecated/clutter-behaviour-opacity.c |    2 +-
 clutter/deprecated/clutter-behaviour-path.c    |    2 +-
 clutter/deprecated/clutter-behaviour.c         |   12 ++--
 clutter/wayland/clutter-backend-wayland.c      |    2 +-
 clutter/win32/clutter-event-win32.c            |    4 +-
 doc/reference/clutter/running-clutter.xml      |   20 +++--
 15 files changed, 125 insertions(+), 83 deletions(-)
---