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

[Nate Stedman <natesm src gnome org>]

commit dab6c2d99fffd85f45f39dbf795873cdff364f86
Merge: 10582e9 bbb015b
Author: Nate Stedman <natesm gmail com>
Date:   Wed Jul 28 21:42:51 2010 -0400

    Merge branch 'master' into video

 data/ui/editor-window.ui                 |   37 ++++++++++++++
 ease-core/ease-slide.vala                |   81 +++++++++++++++++++++++++++++-
 ease-core/ease-undo-actions-element.vala |   56 ++++++++++++++++++++-
 ease-core/ease-undo-controller.vala      |    2 +
 src/ease-editor-window.vala              |   28 ++++++++++
 src/ease-slide-actor.vala                |   29 ++++++++---
 6 files changed, 223 insertions(+), 10 deletions(-)
---