Index: wp-content/themes/twentyten/functions.php
===================================================================
--- wp-content/themes/twentyten/functions.php	(revision 13922)
+++ wp-content/themes/twentyten/functions.php	(working copy)
@@ -60,8 +60,8 @@
  * before the init hook. The init hook is too late for some features, such as indicating
  * support post thumbnails.
  *
- * To override twentyten_setup() in a child theme, remove the action hook and add your own
- * function tied to the after_setup_theme hook.
+ * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's
+ * functions.php file.
  *
  * @uses add_theme_support() To add support for post thumbnails, navigation menus, and automatic feed links.
  * @uses add_custom_background() To add support for a custom background.
@@ -73,6 +73,7 @@
  *
  * @since 3.0.0
  */
+if (! function_exists('twentyten_setup') ):
 function twentyten_setup() {
 
 	// This theme styles the visual editor with editor-style.css to match the theme style.
@@ -166,6 +167,7 @@
 		)
 	) );
 }
+endif;
 
 if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 /**
@@ -430,4 +432,4 @@
 		'after_title' => '</h3>',
 	) );
 }
-add_action( 'init', 'twentyten_widgets_init' );
\ No newline at end of file
+add_action( 'init', 'twentyten_widgets_init' );