Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php	(revision 29713)
+++ wp-includes/formatting.php	(working copy)
@@ -476,7 +476,11 @@
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	$no_unautop_shortcodes = apply_filters( 'no_unautop_shortcodes', array() );
+
+	$unautop_shortcodes = array_diff( array_keys( $shortcode_tags ), $no_unautop_shortcodes );
+
+	$tagregexp = join( '|', array_map( 'preg_quote', $unautop_shortcodes ) );
 	$spaces = wp_spaces_regexp();
 
 	$pattern =