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

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

commit 63dbcc245c0edc92c235374d7918b4a26c4d1158
Merge: bf8f1af ba8d682
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Nov 9 00:30:32 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/Makefile.am                              |    1 -
 clutter/clutter-actor.c                          |    9 ++++-
 clutter/clutter-actor.h                          |    4 --
 clutter/clutter-main.c                           |    9 +---
 clutter/clutter-main.h                           |    5 +-
 clutter/deprecated/clutter-actor.h               |   11 ++++-
 clutter/deprecated/clutter-main.h                |    7 ++-
 clutter/win32/clutter-stage-win32.c              |    4 +-
 clutter/x11/clutter-stage-x11.c                  |    4 +-
 tests/accessibility/cally-atkcomponent-example.c |   44 ++++++++--------------
 tests/accessibility/cally-atkevents-example.c    |   22 ++++++-----
 tests/accessibility/cally-clone-example.c        |    4 +-
 tests/conform/test-pick.c                        |    9 +++-
 13 files changed, 66 insertions(+), 67 deletions(-)
---