Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 13621)
+++ wp-includes/default-filters.php	(working copy)
@@ -233,6 +233,7 @@
 add_action( 'template_redirect',  'wp_old_slug_redirect'       );
 add_action( 'edit_post',          'wp_check_for_changed_slugs' );
 add_action( 'edit_form_advanced', 'wp_remember_old_slug'       );
+add_action( 'edit_page_form',     'wp_remember_old_slug'       );
 add_action( 'init',               '_show_post_preview'         );
 
 // Timezone
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 13621)
+++ wp-includes/post.php	(working copy)
@@ -3611,7 +3611,7 @@
 	$post = &get_post($post_id);
 
 	// we're only concerned with published posts
-	if ( $post->post_status != 'publish' || $post->post_type != 'post' )
+	if ( 'publish' != $post->post_status || ( 'post' != $post->post_type && 'page' != $post->post_type ) )
 		return $post_id;
 
 	// only bother if the slug has changed