[ease/themes: 5/9] Merge branch 'master' into themes

[Nate Stedman <natesm src gnome org>]

commit 1b7d08d97efaa046c523beb1fcad3c671cead153
Merge: b9aa8fd 1c02e99
Author: Nate Stedman <natesm gmail com>
Date:   Fri Jun 4 05:57:48 2010 -0400

    Merge branch 'master' into themes
    
    Conflicts:
    	src/PDFExporter.vala

 Makefile.am           |    2 +
 src/AboutDialog.vala  |  726 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/Document.vala     |   10 +-
 src/EditorWindow.vala |   71 +++--
 src/Enums.vala        |    8 +-
 src/ErrorDialog.vala  |   37 +++
 src/HTMLExporter.vala |   11 +-
 src/Main.vala         |   23 +--
 src/PDFExporter.vala  |   25 +-
 src/Transitions.vala  |   10 +
 src/VideoActor.vala   |   86 ++++++-
 src/ZoomSlider.vala   |   28 ++-
 12 files changed, 952 insertions(+), 85 deletions(-)
---
diff --cc src/PDFExporter.vala
index a2ca2d7,69aea29..5773ddc
--- a/src/PDFExporter.vala
+++ b/src/PDFExporter.vala
@@@ -73,7 -74,13 +74,13 @@@ public static class Ease.PDFExporter : 
  		}
  	}
  	
+ 	/** 
+ 	 * Draws a { link Slide} to a Cairo.Context.
+ 	 *
+ 	 * @param s The { link Slide} to draw.
+ 	 * @param context The Cairo.Context to draw to.
+ 	 */
 -	private static void write_slide(Slide s, Cairo.Context context) throws Error
 +	public static void write_slide(Slide s, Cairo.Context context) throws Error
  	{
  		// write the background color if there is no image
  		if (s.background_image == null)