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

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

commit 1ba134f98b812eb4f268feaeb7d19d71abee6a4d
Merge: 48fd2b6 6228c9f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Sun Aug 14 23:10:00 2011 +0800

    Merge branch 'master' into msvc-support

 NEWS                                               |   46 +++
 README.in                                          |    2 +-
 cogl-pango/Makefile.am                             |    6 +-
 cogl-pango/cogl-pango.pc.in                        |    2 +-
 cogl/Makefile.am                                   |    2 +
 cogl/cogl-buffer-private.h                         |    2 -
 cogl/cogl-buffer.h                                 |    2 +
 cogl/cogl-clip-stack.c                             |   41 ++--
 cogl/cogl-clip-stack.h                             |    4 +-
 cogl/cogl-clip-state-private.h                     |    3 +-
 cogl/cogl-clip-state.c                             |    8 +-
 cogl/cogl-config-private.h                         |   37 +++
 cogl/cogl-config.c                                 |  117 ++++++++
 cogl/cogl-debug.c                                  |   11 +-
 cogl/cogl-debug.h                                  |    5 +
 cogl/cogl-ext-functions.h                          |   10 +-
 cogl/cogl-framebuffer-private.h                    |   24 +--
 cogl/cogl-framebuffer.c                            |   96 +++----
 cogl/cogl-framebuffer.h                            |   67 +++++-
 cogl/cogl-journal.c                                |    5 +-
 cogl/cogl-matrix.c                                 |   62 ++++
 cogl/cogl-matrix.h                                 |   56 ++++
 cogl/cogl-renderer.c                               |    6 +
 cogl/cogl.c                                        |    4 +-
 cogl/cogl2-path.c                                  |    8 +-
 cogl/stb_image.c                                   |  301 ++++++++++----------
 cogl/winsys/cogl-winsys-egl.c                      |   16 +-
 cogl/winsys/cogl-winsys-glx.c                      |   15 +-
 cogl/winsys/cogl-winsys-private.h                  |    2 +-
 configure.ac                                       |   12 +-
 .../cogl-2.0-experimental-sections.txt             |    4 +
 examples/Makefile.am                               |   13 +-
 examples/android/hello/.gitignore                  |    1 -
 examples/android/hello/build.xml                   |   84 ++++++
 examples/android/hello/jni/main.c                  |    2 +-
 35 files changed, 798 insertions(+), 278 deletions(-)
---