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

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

commit d6af2e54c805e88d2d6c65fca63d179ff208891b
Merge: 5419c11 53a1d03
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 20 15:41:46 2011 +0800

    Merge branch 'master' into msvc-support-master

 clutter/clutter-blur-effect.c   |   12 -
 clutter/clutter-clone.c         |  113 ++--
 clutter/clutter-clone.h         |    4 +-
 configure.ac                    |   21 +-
 po/nb.po                        | 1200 ++++++++++++++++++++-------------------
 tests/conform/test-pick.c       |    4 +-
 tests/interactive/test-shader.c |    3 +-
 7 files changed, 681 insertions(+), 676 deletions(-)
---