Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 18473)
+++ wp-includes/taxonomy.php	(working copy)
@@ -311,6 +311,26 @@
 					);
 	$args = wp_parse_args($args, $defaults);
 
+	if ( false === $args['_builtin'] && ! empty( $wp )  ) {
+		$reserved = array(	'category',
+							'link_category',
+							'nav_menu',
+							'post',
+							'post_format',
+							'post_tag',
+							'type',
+						);
+		$reserved = array_merge( $reserved, $wp->public_query_vars, $wp->private_query_vars );
+		if ( in_array( $taxonomy, $reserved ) )
+			_doing_it_wrong( __FUNCTION__, __( 'You should not use a reserved term when registering a taxonomy.' ), '3.3' );
+		
+		// For generating the Codex List: http://codex.wordpress.org/Function_Reference/register_taxonomy#Reserved_Terms
+		//sort( $reserved );
+		//echo '<div>';
+		//foreach ( $reserved as $key ) echo '* ' . $key . '<br />';
+		//echo '</div>';
+	}
+	
 	if ( false !== $args['query_var'] && !empty($wp) ) {
 		if ( true === $args['query_var'] )
 			$args['query_var'] = $taxonomy;