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

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

commit edf17455e9e66bfcb29e704314c4882c83e9d2c0
Merge: 3294161 1744942
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Sep 14 16:36:26 2011 +0800

    Merge branch 'master' into msvc-support

 cogl/Makefile.am                   |    1 +
 cogl/cogl-2.0-experimental.pc.in   |    2 +-
 cogl/cogl-pipeline-fragend-arbfp.c |   12 +++-------
 cogl/cogl2-experimental.h          |   31 ++++++++++++++++++++++++++++++
 cogl/cogl2-path.c                  |    5 ++-
 po/ast.po                          |   37 ++++++++++++++++++++++++++++++++++++
 po/en_GB.po                        |   36 +++++++++++++++++++++++++++++++++++
 po/lv.po                           |   36 +++++++++++++++++++++++++++++++++++
 po/or.po                           |   37 ++++++++++++++++++++++++++++++++++++
 po/pt.po                           |   33 ++++++++++++++++++++++++++++++++
 po/ta.po                           |   37 ++++++++++++++++++++++++++++++++++++
 po/tr.po                           |   37 ++++++++++++++++++++++++++++++++++++
 12 files changed, 293 insertions(+), 11 deletions(-)
---