Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.454.2.5
diff -u -p -r1.454.2.5 book.module
--- modules/book/book.module	3 Jul 2008 06:38:46 -0000	1.454.2.5
+++ modules/book/book.module	18 Sep 2008 00:18:58 -0000
@@ -40,7 +40,7 @@ function book_theme() {
  * Implementation of hook_perm().
  */
 function book_perm() {
-  return array('add content to books', 'administer book outlines', 'create new books', 'access printer-friendly version');
+  return array('administer book outlines', 'create new books', 'add content to books', 'access printer-friendly version');
 }
 
 /**
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.617.2.3
diff -u -p -r1.617.2.3 comment.module
--- modules/comment/comment.module	17 Sep 2008 06:22:38 -0000	1.617.2.3
+++ modules/comment/comment.module	18 Sep 2008 00:19:43 -0000
@@ -272,7 +272,7 @@ function comment_node_type($op, $info) {
  * Implementation of hook_perm().
  */
 function comment_perm() {
-  return array('access comments', 'post comments', 'administer comments', 'post comments without approval');
+  return array('administer comments', 'access comments', 'post comments', 'post comments without approval');
 }
 
 /**
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.103.2.1
diff -u -p -r1.103.2.1 contact.module
--- modules/contact/contact.module	9 Apr 2008 21:11:46 -0000	1.103.2.1
+++ modules/contact/contact.module	18 Sep 2008 00:20:04 -0000
@@ -36,7 +36,7 @@ function contact_help($path, $arg) {
  * Implementation of hook_perm
  */
 function contact_perm() {
-  return array('access site-wide contact form', 'administer site-wide contact form');
+  return array('administer site-wide contact form', 'access site-wide contact form');
 }
 /**
  * Implementation of hook_menu().
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.947.2.11
diff -u -p -r1.947.2.11 node.module
--- modules/node/node.module	25 Jun 2008 08:59:57 -0000	1.947.2.11
+++ modules/node/node.module	18 Sep 2008 00:20:38 -0000
@@ -1125,10 +1125,10 @@ function node_perm() {
     if ($type->module == 'node') {
       $name = check_plain($type->type);
       $perms[] = 'create '. $name .' content';
-      $perms[] = 'delete own '. $name .' content';
-      $perms[] = 'delete any '. $name .' content';
       $perms[] = 'edit own '. $name .' content';
       $perms[] = 'edit any '. $name .' content';
+      $perms[] = 'delete own '. $name .' content';
+      $perms[] = 'delete any '. $name .' content';
     }
   }
 
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.138.2.2
diff -u -p -r1.138.2.2 path.module
--- modules/path/path.module	21 Jun 2008 18:22:53 -0000	1.138.2.2
+++ modules/path/path.module	18 Sep 2008 00:21:21 -0000
@@ -210,7 +210,7 @@ function path_form_alter(&$form, $form_s
  * Implementation of hook_perm().
  */
 function path_perm() {
-  return array('create url aliases', 'administer url aliases');
+  return array('administer url aliases', 'create url aliases');
 }
 
 /**
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.250.2.4
diff -u -p -r1.250.2.4 search.module
--- modules/search/search.module	17 Sep 2008 06:42:20 -0000	1.250.2.4
+++ modules/search/search.module	18 Sep 2008 00:21:39 -0000
@@ -141,7 +141,7 @@ function search_theme() {
  * Implementation of hook_perm().
  */
 function search_perm() {
-  return array('search content', 'use advanced search', 'administer search');
+  return array('administer search', 'search content', 'use advanced search');
 }
 
 /**
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.585.2.19
diff -u -p -r1.585.2.19 system.module
--- modules/system/system.module	5 Sep 2008 09:29:23 -0000	1.585.2.19
+++ modules/system/system.module	18 Sep 2008 00:23:41 -0000
@@ -155,7 +155,7 @@ function system_theme() {
  * Implementation of hook_perm().
  */
 function system_perm() {
-  return array('administer site configuration', 'access administration pages', 'administer actions', 'access site reports', 'select different theme', 'administer files');
+  return array('administer site configuration', 'administer actions', 'administer files', 'access administration pages', 'access site reports', 'select different theme');
 }
 
 /**
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.18.2.1
diff -u -p -r1.18.2.1 user.admin.inc
--- modules/user/user.admin.inc	13 Aug 2008 23:59:14 -0000	1.18.2.1
+++ modules/user/user.admin.inc	18 Sep 2008 00:24:42 -0000
@@ -521,7 +521,6 @@ function user_admin_perm($form_state, $r
       $form['permission'][] = array(
         '#value' => $module,
       );
-      asort($permissions);
       foreach ($permissions as $perm) {
         $options[$perm] = '';
         $form['permission'][$perm] = array('#value' => t($perm));