Index: wp-admin/media-upload.php
===================================================================
--- wp-admin/media-upload.php	(revision 16658)
+++ wp-admin/media-upload.php	(working copy)
@@ -9,7 +9,8 @@
  * @subpackage Administration
  */
 
-define('IFRAME_REQUEST' , true);
+if ( ! isset( $_GET['inline'] ) )
+	define( 'IFRAME_REQUEST' , true );
 
 /** Load WordPress Administration Bootstrap */
 require_once('./admin.php');
