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

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

commit 1cf712854007d5b376877de31c8a474b10a3bc8a
Merge: a9771b5 58fec63
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Oct 11 17:19:45 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/clutter-animation.c               |   60 +-
 clutter/clutter-box-layout.c              |   26 +-
 clutter/clutter-event.h                   |    1 +
 clutter/clutter-keysyms-table.c           |  804 ++++++++++++++++++
 clutter/clutter-main.c                    |   67 +-
 clutter/clutter-main.h                    |    3 +
 clutter/clutter-state.c                   |    4 +-
 clutter/clutter-texture.c                 |    4 +-
 po/es.po                                  | 1144 ++++++++++++++-------------
 po/lt.po                                  | 1251 +++++++++++++++--------------
 tests/interactive/test-texture-async.c    |    5 +-
 tests/interactive/test-texture-material.c |    2 -
 tests/interactive/test-threads.c          |    2 -
 13 files changed, 2125 insertions(+), 1248 deletions(-)
---