diff -Nru shotwell-0.12.0/debian/changelog shotwell-0.12.1/debian/changelog
--- shotwell-0.12.0/debian/changelog	2012-03-28 02:01:16.000000000 +0000
+++ shotwell-0.12.1/debian/changelog	2012-03-29 00:42:44.000000000 +0000
@@ -1,3 +1,11 @@
+shotwell (0.12.1-0ubuntu1) precise-proposed; urgency=low
+
+  * New upstream release:
+    - Corrects a critical issue where the application could not be started in
+      direct-edit mode.  
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 29 Mar 2012 11:37:01 +1100
+
 shotwell (0.12.0-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream release:
diff -Nru shotwell-0.12.0/Makefile shotwell-0.12.1/Makefile
--- shotwell-0.12.0/Makefile	2012-03-27 20:59:45.000000000 +0000
+++ shotwell-0.12.1/Makefile	2012-03-28 22:35:57.000000000 +0000
@@ -1,7 +1,7 @@
 PROGRAM = shotwell
 PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
 
-VERSION = 0.12.0
+VERSION = 0.12.1
 GETTEXT_PACKAGE = $(PROGRAM)
 BUILD_ROOT = 1
 
@@ -120,6 +120,7 @@
 RESOURCE_FILES = \
 	collection.ui \
 	direct.ui \
+	direct_context.ui \
 	events_directory.ui \
 	event.ui \
 	fullscreen.ui \
@@ -128,18 +129,18 @@
 	media.ui \
 	offline.ui \
 	photo.ui \
+	photo_context.ui \
 	savedsearch.ui \
 	search_bar.ui \
+	search_sidebar_context.ui \
 	set_background_dialog.glade \
 	shotwell.glade \
 	shotwell.xml \
 	sidebar_default_context.ui \
+	tag_sidebar_context.ui \
 	tags.ui \
-	trash.ui \
-	search_sidebar_context.ui \
 	top.ui \
-	photo_context.ui \
-	tag_sidebar_context.ui
+	trash.ui 
 
 SYS_INTEGRATION_FILES = \
 	shotwell.desktop.head \
diff -Nru shotwell-0.12.0/NEWS shotwell-0.12.1/NEWS
--- shotwell-0.12.0/NEWS	2012-03-27 19:59:29.000000000 +0000
+++ shotwell-0.12.1/NEWS	2012-03-28 22:35:57.000000000 +0000
@@ -1,3 +1,10 @@
+Shotwell 0.12.1 - 28 March 2012 - "Oh No, Not The Knuckle..."
+----------------------------------------------------------------------------
+
+  * Corrects a critical issue where the application could not be started in
+    direct-edit mode.
+
+
 Shotwell 0.12.0 - 27 March 2012 - "A Counter-Clockwise Swirl"
 ----------------------------------------------------------------------------
 
diff -Nru shotwell-0.12.0/ui/direct_context.ui shotwell-0.12.1/ui/direct_context.ui
--- shotwell-0.12.0/ui/direct_context.ui	1970-01-01 00:00:00.000000000 +0000
+++ shotwell-0.12.1/ui/direct_context.ui	2012-03-28 22:35:57.000000000 +0000
@@ -0,0 +1,10 @@
+<ui>
+    <popup name="DirectContextMenu">
+        <menuitem name="ContextEnhance" action="Enhance" />
+        <menuitem name="ContextRevert" action="Revert" />
+        <separator />
+        <placeholder name="ContextJumpPlaceholder" />
+        <menuitem name="ContextSendTo" action="SendTo" />
+    </popup>
+</ui>
+