Index: modules/file/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/tests/file.test,v
retrieving revision 1.9
diff -u -9 -p -r1.9 file.test
--- modules/file/tests/file.test	9 Jan 2010 21:54:00 -0000	1.9
+++ modules/file/tests/file.test	4 Feb 2010 21:46:04 -0000
@@ -8,19 +8,19 @@
 
 /**
  * This class provides methods specifically for testing File's field handling.
  */
 class FileFieldTestCase extends DrupalWebTestCase {
   protected $admin_user;
 
   function setUp() {
     parent::setUp('file');
-    $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer files'));
+    $this->admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content'));
     $this->drupalLogin($this->admin_user);
   }
 
   /**
    * Get a sample file of the specified type.
    */
   function getTestFile($type_name, $size = NULL) {
     // Get a file to upload.
     $file = current($this->drupalGetTestFiles($type_name, $size));
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.884
diff -u -9 -p -r1.884 system.module
--- modules/system/system.module	2 Feb 2010 08:10:03 -0000	1.884
+++ modules/system/system.module	4 Feb 2010 21:46:04 -0000
@@ -211,21 +211,18 @@ function system_permission() {
     'administer themes' => array(
       'title' => t('Administer themes'),
     ),
     'administer software updates' => array(
       'title' => t('Run software updates'),
     ),
     'administer actions' => array(
       'title' => t('Administer actions'),
     ),
-    'administer files' => array(
-      'title' => t('Administer user-uploaded files'),
-    ),
     'access administration pages' => array(
       'title' => t('Use the administration pages and help'),
     ),
     'access site in maintenance mode' => array(
       'title' => t('Use the site in maintenance mode'),
     ),
     'access site reports' => array(
       'title' => t('View site reports'),
     ),