diff -Nru midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/debian/bzr-builder.manifest midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/debian/bzr-builder.manifest
--- midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/debian/bzr-builder.manifest	2015-03-28 15:46:58.000000000 +0000
+++ midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/debian/bzr-builder.manifest	2015-03-29 15:46:41.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}+r6913+pkg38
-lp:midori revid:rabbitbot-20150328154041-p1a5n1hr2584wufb
+# bzr-builder format 0.3 deb-version {debupstream}+r6914+pkg38
+lp:midori revid:rabbitbot-20150329144037-lksv37f2ung47271
 nest packaging lp:~midori/midori/packaging-granite debian revid:ricotz@ubuntu.com-20150323065852-4a3t3sww06pgj5tt
diff -Nru midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/debian/changelog midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/debian/changelog
--- midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/debian/changelog	2015-03-28 15:46:58.000000000 +0000
+++ midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/debian/changelog	2015-03-29 15:46:41.000000000 +0000
@@ -1,8 +1,8 @@
-midori-granite (0.5.9+r6913+pkg38~ubuntu14.10.1) utopic; urgency=low
+midori-granite (0.5.9+r6914+pkg38~ubuntu14.10.1) utopic; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 28 Mar 2015 15:46:58 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sun, 29 Mar 2015 15:46:41 +0000
 
 midori-granite (0.5.9) UNRELEASED; urgency=medium
 
diff -Nru midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/midori/midori-view.c midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/midori/midori-view.c
--- midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/midori/midori-view.c	2015-03-28 15:46:58.000000000 +0000
+++ midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/midori/midori-view.c	2015-03-29 15:46:41.000000000 +0000
@@ -1264,7 +1264,9 @@
                                         message, error->message, NULL,
                                         _("Try Again"), web_frame);
 
-    midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
+    /* if the main frame for the whole tab has a network error, set tab error status */
+    if (web_frame == webkit_web_view_get_main_frame (web_view))
+        midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
 
     g_free (message);
     g_free (title);
diff -Nru midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/.pc/enable-granite-overlaybar.patch/midori/midori-view.c midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/.pc/enable-granite-overlaybar.patch/midori/midori-view.c
--- midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/.pc/enable-granite-overlaybar.patch/midori/midori-view.c	2015-03-28 15:46:58.000000000 +0000
+++ midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/.pc/enable-granite-overlaybar.patch/midori/midori-view.c	2015-03-29 15:46:41.000000000 +0000
@@ -1256,7 +1256,9 @@
                                         message, error->message, NULL,
                                         _("Try Again"), web_frame);
 
-    midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
+    /* if the main frame for the whole tab has a network error, set tab error status */
+    if (web_frame == webkit_web_view_get_main_frame (web_view))
+        midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
 
     g_free (message);
     g_free (title);
diff -Nru midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/.pc/.quilt_patches midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/.pc/.quilt_patches
--- midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/.pc/.quilt_patches	2015-03-28 15:46:58.000000000 +0000
+++ midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/.pc/.quilt_patches	2015-03-29 15:46:41.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-895926/chroot-autobuild/home/buildd/work/tree/midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/debian/patches
+/home/buildd/build-RECIPEBRANCHBUILD-896365/chroot-autobuild/home/buildd/work/tree/midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/debian/patches
diff -Nru midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/.pc/.quilt_series midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/.pc/.quilt_series
--- midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/.pc/.quilt_series	2015-03-28 15:46:58.000000000 +0000
+++ midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/.pc/.quilt_series	2015-03-29 15:46:41.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-895926/chroot-autobuild/home/buildd/work/tree/midori-granite-0.5.9+r6913+pkg38~ubuntu14.10.1/debian/patches/series
+/home/buildd/build-RECIPEBRANCHBUILD-896365/chroot-autobuild/home/buildd/work/tree/midori-granite-0.5.9+r6914+pkg38~ubuntu14.10.1/debian/patches/series