Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 19262)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -2890,6 +2890,7 @@
 }
 
 #post-body ul.category-tabs,
+#post-body ul.wp-tab-bar,
 #post-body ul.add-menu-item-tabs {
 	float: left;
 	width: 120px;
@@ -2900,16 +2901,20 @@
 }
 
 #post-body ul.category-tabs li,
+#post-body ul.wp-tab-bar li,
 #post-body ul.add-menu-item-tabs li {
 	padding: 8px;
 }
 
 #post-body ul.category-tabs li.tabs,
+#post-body ul.wp-tab-bar li.wp-tab-active,
 #post-body ul.add-menu-item-tabs li.tabs {
 	-webkit-border-top-left-radius: 3px;
 	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-top-right-radius: 0px;
 	border-top-left-radius: 3px;
 	border-bottom-left-radius: 3px;
+	border-top-right-radius: 0px;
 }
 
 .wp-tab-panel,
@@ -2932,15 +2937,18 @@
 	max-height: 205px;
 }
 
-div.tabs-panel-active {
+div.tabs-panel-active,
+div.wp-tab-panel-active {
 	display:block;
 }
 
-div.tabs-panel-inactive {
+div.tabs-panel-inactive,
+div.wp-tab-panel-inactive {
 	display:none;
 }
 
 #post-body .categorydiv div.tabs-panel,
+#post-body div.wp-tab-panel,
 .taxonomy div.tabs-panel,
 #post-body #linkcategorydiv div.tabs-panel {
 	margin: 0 5px 0 125px;
@@ -2948,21 +2956,23 @@
 
 .has-right-sidebar #side-sortables .category-tabs li,
 #side-sortables .add-menu-item-tabs li,
-.wp-tab-bar li {
+.has-right-sidebar #side-sortables .wp-tab-bar li {
 	display: inline;
 	line-height: 1.35em;
 }
 
+.no-js #side-sortables .wp-tab-bar li.hide-if-no-js,
 .no-js #side-sortables .category-tabs li.hide-if-no-js {
  	display: none;
 }
 
 #side-sortables .category-tabs a,
 #side-sortables .add-menu-item-tabs a,
-.wp-tab-bar a {
+#side-sortables .wp-tab-bar a {
 	text-decoration: none;
 }
 
+#side-sortables .wp-tab-bar,
 #side-sortables .category-tabs {
 	margin: 8px 0 3px;
 }
@@ -2972,7 +2982,7 @@
 }
 
 #side-sortables .add-menu-item-tabs,
-.wp-tab-bar {
+#side-sortables .wp-tab-bar {
 	margin-bottom: 3px;
 }
 
@@ -3033,6 +3043,7 @@
 }
 
 #post-body .category-tabs li.tabs,
+#post-body .wp-tab-bar li.wp-tab-active,
 #post-body .add-menu-item-tabs li.tabs {
 	border-style: solid none solid solid;
 	border-width: 1px 0 1px 1px;
@@ -3305,6 +3316,7 @@
 }
 
 #post-body ul.category-tabs,
+#post-body ul.wp-tab-bar,
 #post-body ul.add-menu-item-tabs {
 	float: left;
 	width: 120px;
@@ -3315,11 +3327,13 @@
 }
 
 #post-body ul.category-tabs li,
+#post-body ul.wp-tab-bar li,
 #post-body ul.add-menu-item-tabs li {
 	padding: 8px;
 }
 
 #post-body ul.category-tabs li.tabs,
+#post-body ul.wp-tab-bar li.wp-tab-active,
 #post-body ul.add-menu-item-tabs li.tabs {
 	-webkit-border-top-left-radius: 3px;
 	-webkit-border-bottom-left-radius: 3px;
@@ -3355,6 +3369,7 @@
 }
 
 #post-body .categorydiv div.tabs-panel,
+#post-body div.wp-tab-panel,
 .taxonomy div.tabs-panel,
 #post-body #linkcategorydiv div.tabs-panel {
 	margin: 0 5px 0 125px;
@@ -4393,6 +4408,7 @@
 }
 
 #post-body ul.category-tabs li.tabs a,
+#post-body ul.wp-tab-bar li.wp-tab-active a,
 #post-body ul.add-menu-item-tabs li.tabs a,
 #TB_window #TB_title a.tb-theme-preview-link,
 #TB_window #TB_title a.tb-theme-preview-link:visited {
Index: wp-admin/js/wp-tabs.dev.js
===================================================================
--- wp-admin/js/wp-tabs.dev.js	(revision 0)
+++ wp-admin/js/wp-tabs.dev.js	(working copy)
@@ -0,0 +1,19 @@
+jQuery(document).ready( function($) {
+	// wp tabs
+	$('.wp-tab-bar a').click(function(event){
+		event.preventDefault();
+		// Limit effect to the container element.
+		var context = $(this).closest('.wp-tab-bar').parent();
+		$('.wp-tab-bar li', context).removeClass('wp-tab-active');
+		$(this).closest('li').addClass('wp-tab-active');
+		$('.wp-tab-panel', context).hide();
+		$( $(this).attr('href'), context ).show();
+	});
+	// Make setting wp-tab-active optional.
+	$('.wp-tab-bar').each(function(){
+		if ( $('.wp-tab-active', this).length )
+			$('.wp-tab-active', this).click();
+		else
+			$('a', this).first().click();
+	});
+});
Index: wp-includes/script-loader.php
===================================================================
--- wp-includes/script-loader.php	(revision 19262)
+++ wp-includes/script-loader.php	(working copy)
@@ -305,7 +305,8 @@
 
 		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), '20110524', 1 );
 
-		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20111009a', 1 );
+		$scripts->add( 'wp-tabs', "/wp-admin/js/wp-tabs$suffix.js", array('jquery'), '20111110', 1 );
+		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable','wp-tabs'), '20111009a', 1 );
 
 		$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20110524', 1 );
 		$scripts->localize( 'post', 'postL10n', array(