Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 5773)
+++ wp-includes/link-template.php	(working copy)
@@ -271,6 +271,23 @@
 	return apply_filters('post_comments_feed_link', $url);
 }
 
+function get_clear_password_link(){
+	$url = get_option('home') . "/?clear_password=yes";
+	return apply_filters('clear_password_link',$url);
+}
+
+function clear_password_link($post,$tail){
+	if ( !empty($post->post_password) ){
+		if ( stripslashes($_COOKIE['wp-postpass_'.COOKIEHASH]) == $post->post_password ){
+			$link = '<a href="';
+			$link = $link . get_clear_password_link();
+			$link = $link . '">Clear Post Password</a>';
+			$link = $link . $tail;
+			echo $link;
+		}
+	}
+}
+
 function get_edit_post_link( $id = 0 ) {
 	$post = &get_post( $id );
 
Index: wp-includes/query.php
===================================================================
--- wp-includes/query.php	(revision 5773)
+++ wp-includes/query.php	(working copy)
@@ -406,6 +406,7 @@
 			, 'paged'
 			, 'comments_popup'
 			, 'preview'
+			, 'clear_password'
 		);
 
 		foreach ($keys as $key) {
@@ -718,6 +719,9 @@
 			$q['page'] = (int) $q['page'];
 			$q['page'] = abs($q['page']);
 		}
+		if (isset($q['clear_password'])){
+			setcookie('wp-postpass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
+		}
 
 		$add_hours = intval(get_option('gmt_offset'));
 		$add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));