[ease/plugins: 5/7] Merge branch 'master' into plugins

[Nate Stedman <natesm src gnome org>]

commit 36d4f4d2bc2f13a8e9560a8cdb7a6c3bcec3775b
Merge: 35b2a25 760f609
Author: Nate Stedman <natesm gmail com>
Date:   Fri Jun 18 06:37:08 2010 -0400

    Merge branch 'master' into plugins
    
    Conflicts:
    	Makefile.am

 Makefile.am                        |    3 +
 configure.ac                       |    2 +-
 src/ease-close-confirm-dialog.vala |  109 ++++++++++++++++++++++++++++++++++++
 src/ease-editor-window.vala        |  104 ++++++++++++++++++++++++-----------
 4 files changed, 185 insertions(+), 33 deletions(-)
---
diff --cc Makefile.am
index 0a3a391,3313f5a..4bd291c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -80,8 -79,7 +81,10 @@@ VALAFLAGS = --pkg glib-2.0 
  		--pkg clutter-gst-1.0\
  		--pkg json-glib-1.0\
  		--pkg libarchive\
 +		--pkg libsexy\
 +		--pkg rest-extras-0.6\
+ 		-g \
++		--thread \
  		$(NULL)
  
  SUBDIRS = po