[ease: 3/3] Merge branch 'recovery'

[Nate Stedman <natesm src gnome org>]

commit 429e5c89f0900b3dd7389ca63abd8468da752b19
Merge: a1a1014 9749650
Author: Nate Stedman <natesm gmail com>
Date:   Sun Nov 28 15:51:09 2010 -0500

    Merge branch 'recovery'

 ease-core/ease-background.vala    |    9 ++-
 ease-core/ease-cairo-actor.vala   |    2 +-
 ease-core/ease-document.vala      |    2 +-
 ease-core/ease-element.vala       |   30 +++------
 ease-core/ease-image-element.vala |   51 +++-----------
 ease-core/ease-image.vala         |  135 ++++++++++++++++++++++++++++---------
 ease-core/ease-pdf-actor.vala     |    2 +-
 ease-core/ease-pdf-element.vala   |    7 +-
 ease-core/ease-shape-element.vala |    7 +-
 ease-core/ease-slide.vala         |   45 ++++---------
 ease-core/ease-text-element.vala  |    3 +-
 ease-core/ease-theme.vala         |    8 +-
 ease-core/ease-video-element.vala |    3 +-
 ease/ease-handle.vala             |    3 +
 ease/ease-slide-actor.vala        |    4 +-
 ease/ease-slide-button-panel.vala |    2 +-
 ease/ease-welcome-actor.vala      |    2 +-
 17 files changed, 168 insertions(+), 147 deletions(-)
---