Merge branch 'zoomable'

* zoomable:
  [git ignore] Ignore backup and m4 files
  Update the Viewport example
  [viewport] Implement Zoomable
  [zoomable] Fix Introspection data generation
  [zoomable] Add Zoomable interface

Conflicts:
	clutter-gtk/Makefile.am
	clutter-gtk/gtk-clutter-viewport.c

diff --cc clutter-gtk/Makefile.am
index 9aebf6f,2687e4f..127e189
--- 1/clutter-gtk/Makefile.am
--- 2/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@@ -22,11 -21,12 +21,12 @@@ AM_CPPFLAGS = 
  lib_LTLIBRARIES = libclutter-gtk-0.9.la
  
  # please, keep the list sorted alphabetically
 -libclutter_gtk_0_9_la_SOURCES =       \
 -        gtk-clutter-embed.c           \
 -        gtk-clutter-scrollable.c      \
 -        gtk-clutter-util.c            \
 -        gtk-clutter-viewport.c                \
 -      gtk-clutter-zoomable.c
 +libclutter_gtk_0_9_la_SOURCES = \
 +      $(srcdir)/gtk-clutter-embed.c           \
 +      $(srcdir)/gtk-clutter-scrollable.c      \
 +      $(srcdir)/gtk-clutter-util.c            \
-       $(srcdir)/gtk-clutter-viewport.c
++      $(srcdir)/gtk-clutter-viewport.c        \
++      $(srcdir)/gtk-clutter-zoomable.c
  
  libclutter_gtk_0_9_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
  
@@@ -35,12 -35,13 +35,13 @@@ libclutter_gtk_0_9_la_LDFLAGS = $(CLUTT
  cluttergtkheadersdir = $(includedir)/clutter-0.9/clutter-gtk
  
  # please, keep the list sorted alphabetically
 -cluttergtkheaders_HEADERS =           \
 -        clutter-gtk.h                         \
 -        gtk-clutter-embed.h           \
 -        gtk-clutter-scrollable.h      \
 -        gtk-clutter-util.h            \
 -        gtk-clutter-viewport.h                \
 -      gtk-clutter-zoomable.h
 +cluttergtkheaders_HEADERS = \
 +      $(top_srcdir)/clutter-gtk/clutter-gtk.h                 \
 +      $(top_srcdir)/clutter-gtk/gtk-clutter-embed.h           \
 +      $(top_srcdir)/clutter-gtk/gtk-clutter-scrollable.h      \
 +      $(top_srcdir)/clutter-gtk/gtk-clutter-util.h            \
-       $(top_srcdir)/clutter-gtk/gtk-clutter-viewport.h
++      $(top_srcdir)/clutter-gtk/gtk-clutter-viewport.h        \
++      $(top_srcdir)/clutter-gtk/gtk-clutter-zoomable.h
  
  if HAVE_INTROSPECTION
  BUILT_GIRSOURCES =

diff --cc clutter-gtk/gtk-clutter-viewport.c
Simple merge