Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php	(revision 17572)
+++ wp-includes/formatting.php	(working copy)
@@ -250,6 +250,7 @@
 		$tagnames = array_keys($shortcode_tags);
 		$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
 		$pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee);
+		$pee = preg_replace('/(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<br\\s*\\/>/s', '$1', $pee);
 	}
 
 	return $pee;