[ease/sourceview: 2/2] Merge branch 'master' into sourceview

[Nate Stedman <natesm src gnome org>]

commit 4bfca1a79296f34053f347c01574342327872e49
Merge: 2830926 92dbd95
Author: Nate Stedman <natesm gmail com>
Date:   Sat Jun 12 12:38:33 2010 -0400

    Merge branch 'master' into sourceview

 vapi/clutter-1.0.deps      |    4 -
 vapi/clutter-1.0.vapi      | 1876 -----------
 vapi/clutter-gst-1.0.deps  |    3 -
 vapi/clutter-gst-1.0.vapi  |   32 -
 vapi/clutter-gtk-0.10.deps |    8 -
 vapi/clutter-gtk-0.10.vapi |   74 -
 vapi/cogl-1.0.deps         |    1 -
 vapi/cogl-1.0.vapi         |  602 ----
 vapi/gdk-2.0.deps          |    5 -
 vapi/gdk-2.0.vapi          | 1829 -----------
 vapi/gio-2.0.vapi          | 1731 ----------
 vapi/glib-2.0.vapi         | 3877 ----------------------
 vapi/gtk+-2.0.deps         |    6 -
 vapi/gtk+-2.0.vapi         | 7762 --------------------------------------------
 vapi/libxml-2.0.vapi       | 1815 -----------
 15 files changed, 0 insertions(+), 19625 deletions(-)
---