Index: general-template.php
===================================================================
--- general-template.php	(revision 29250)
+++ general-template.php	(working copy)
@@ -2087,22 +2087,30 @@
  * @param array $args Optional arguments.
  */
 function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
+	if ( ! current_theme_supports( 'automatic-feed-links' ) ) {
 		return;
+	}
 
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
-		'separator'	=> _x('»', 'feed link'),
+		'separator'	=> _x( '»', 'feed link' ),
 		/* translators: 1: blog title, 2: separator (raquo) */
-		'feedtitle'	=> __('%1$s %2$s Feed'),
+		'feedtitle'	=> __( '%1$s %2$s Feed' ),
 		/* translators: 1: blog title, 2: separator (raquo) */
-		'comstitle'	=> __('%1$s %2$s Comments Feed'),
+		'comstitle'	=> __( '%1$s %2$s Comments Feed' ),
 	);
 
 	$args = wp_parse_args( $args, $defaults );
 
-	echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['feedtitle'], get_bloginfo('name'), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link() ) . "\" />\n";
-	echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['comstitle'], get_bloginfo('name'), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link( 'comments_' . get_default_feed() ) ) . "\" />\n";
+	$feed_and_coms = apply_filters( 'feed_links_types', array( 'posts' => true, 'comments' => true ) );
+
+	if( isset( $feed_and_coms['posts'] ) && (bool) $feed_and_coms['posts'] ) {
+		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['feedtitle'], get_bloginfo( 'name' ), $args['separator'] ) ) . '" href="' . get_feed_link() . "\" />\n";
+	}
+
+	if( isset( $feed_and_coms['comments'] ) && (bool) $feed_and_coms['comments'] ) {
+		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['comstitle'], get_bloginfo( 'name' ), $args['separator'] ) ) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
+	}
 }
 
 /**