Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 18056)
+++ wp-includes/post.php	(working copy)
@@ -5084,24 +5084,14 @@
 /**
  * Retrieves an array of post format slugs.
  *
+ * @uses get_post_format_strings()
  * @since 3.1.0
  *
  * @return array The array of post format slugs.
  */
 function get_post_format_slugs() {
-	// 3.2-early: use array_combine() and array_keys( get_post_format_strings() )
-	$slugs = array(
-		'standard' => 'standard', // Special case. any value that evals to false will be considered standard
-		'aside'    => 'aside',
-		'chat'     => 'chat',
-		'gallery'  => 'gallery',
-		'link'     => 'link',
-		'image'    => 'image',
-		'quote'    => 'quote',
-		'status'   => 'status',
-		'video'    => 'video',
-		'audio'    => 'audio',
-	);
+	$slugs = array_keys( get_post_format_strings() );
+	$slugs = array_combine( $slugs, $slugs );
 	return $slugs;
 }