[ease: 9/10] Merge branch 'master' into video

[Nate Stedman <natesm src gnome org>]

commit e5193ce497bc64896fac82e074c00a783ef83529
Merge: 77f9952 a512458
Author: Nate Stedman <natesm gmail com>
Date:   Fri Jul 30 01:56:50 2010 -0400

    Merge branch 'master' into video

 data/Makefile.am                          |    6 +-
 data/ease.desktop.in                      |    1 +
 data/icons/hicolor/scalable/apps/ease.svg |  103 ++++
 ease-core/ease-0.1.vapi                   |  747 -----------------------------
 src/ease-main.vala                        |    6 +-
 5 files changed, 114 insertions(+), 749 deletions(-)
---