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

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

commit 4e32fccbf845d1fdc0de1976ae9bb53d038fe907
Merge: a1a2d54 5002ff7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Jun 20 12:30:55 2011 +0800

    Merge branch 'master' into msvc-support

 clutter/clutter-actor-private.h   |    6 +-
 clutter/clutter-actor.c           |  192 ++++---
 clutter/clutter-debug.h           |    3 +-
 clutter/clutter-group.c           |   12 +-
 clutter/clutter-keysyms-compat.h  |  106 ++++-
 clutter/clutter-keysyms.h         |  106 ++++-
 clutter/clutter-main.c            |    8 +-
 clutter/clutter-paint-volume.c    |   36 +--
 clutter/clutter-texture.c         |   14 +-
 clutter/cogl/clutter-stage-cogl.c |   17 +-
 po/es.po                          | 1103 +++++++++++++++++++------------------
 11 files changed, 886 insertions(+), 717 deletions(-)
---