[gjs: 45/45] Merge branch 'cairo'

[Johan Dahlin <johan src gnome org>]

commit 787d3543480e549026db84bd4aa0bc71adc35e5c
Merge: f69e5c6 d4789d2
Author: Johan Dahlin <johan gnome org>
Date:   Tue Mar 2 15:51:08 2010 -0300

    Merge branch 'cairo'

 Makefile-examples.am            |   10 +-
 Makefile-modules.am             |   32 ++-
 Makefile-test.am                |    1 +
 configure.ac                    |    5 +
 doc/cairo.txt                   |   97 +++++
 modules/cairo-context.c         |  817 +++++++++++++++++++++++++++++++++++++++
 modules/cairo-gradient.c        |  105 +++++
 modules/cairo-image-surface.c   |  145 +++++++
 modules/cairo-linear-gradient.c |   98 +++++
 modules/cairo-pattern.c         |  206 ++++++++++
 modules/cairo-pdf-surface.c     |  105 +++++
 modules/cairo-private.h         |  153 ++++++++
 modules/cairo-ps-surface.c      |  114 ++++++
 modules/cairo-radial-gradient.c |  100 +++++
 modules/cairo-solid-pattern.c   |  127 ++++++
 modules/cairo-surface-pattern.c |  205 ++++++++++
 modules/cairo-surface.c         |  245 ++++++++++++
 modules/cairo-svg-surface.c     |  105 +++++
 modules/cairo.c                 |  126 ++++++
 modules/cairo.js                |  132 +++++++
 test/js/testCairo.js            |  156 ++++++++
 21 files changed, 3078 insertions(+), 6 deletions(-)
---