[ease/animate_zoom: 13/13] Merge branch 'master' into animate_zoom

[Nate Stedman <natesm src gnome org>]

commit 026f0d25dd0cf737735e21973bfeebd178e828be
Merge: 31a549d a89e474
Author: Nate Stedman <natesm gmail com>
Date:   Thu May 20 16:49:11 2010 -0400

    Merge branch 'master' into animate_zoom

 Examples/Example.ease/Document.xml      |    2 +-
 Examples/Transitions.ease/Document.xml  |  105 +-
 Makefile                                |   48 +-
 src/{libease => }/Actor.vala            |   15 +
 src/{libease => }/Document.vala         |   15 +-
 src/{libease => }/EditorEmbed.vala      |   81 +-
 src/{libease => }/EditorWindow.vala     |    1 +
 src/{libease => }/Element.vala          |   11 +-
 src/{libease => }/ElementMap.vala       |    0
 src/{libease => }/ElementMapValue.vala  |    0
 src/{libease => }/Enums.vala            |    0
 src/{libease => }/HTMLExporter.vala     |    0
 src/{libease => }/Handle.vala           |   49 +-
 src/{libease => }/ImageActor.vala       |    0
 src/{libease => }/Main.vala             |   50 +-
 src/{libease => }/MainToolbar.vala      |    0
 src/{libease => }/OpenDialog.vala       |    0
 src/{libease => }/Player.vala           |    7 +-
 src/{libease => }/ScrollableEmbed.vala  |    0
 src/{libease => }/Slide.vala            |    0
 src/{libease => }/SlideActor.vala       |  325 ++-
 src/{libease => }/SlideButton.vala      |    4 +-
 src/{libease => }/SlideButtonPanel.vala |    0
 src/{libease => }/SlidePane.vala        |    0
 src/{libease => }/TextActor.vala        |    2 +-
 src/{libease => }/Theme.vala            |    0
 src/{libease => }/TransitionPane.vala   |    4 +-
 src/{libease => }/Transitions.vala      |    3 +
 src/{libease => }/UndoActions.vala      |   22 +-
 src/{libease => }/UndoController.vala   |    2 +-
 src/{libease => }/VideoActor.vala       |    0
 src/{libease => }/WelcomeActor.vala     |   11 +-
 src/{libease => }/WelcomeWindow.vala    |   17 +-
 src/{libease => }/ZoomSlider.vala       |    0
 src/ease-player/main.c                  |   23 -
 src/ease/main.c                         |   24 -
 vapi/clutter-1.0.vapi                   | 5581 +++++--------------------------
 37 files changed, 1348 insertions(+), 5054 deletions(-)
---