Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.297
diff -u -p -r1.297 blog.module
--- modules/blog/blog.module	9 Jan 2008 09:51:34 -0000	1.297
+++ modules/blog/blog.module	11 Apr 2008 22:32:53 -0000
@@ -23,7 +23,7 @@ function blog_node_info() {
  * Implementation of hook_perm().
  */
 function blog_perm() {
-  return array('create blog entries', 'delete own blog entries', 'delete any blog entry', 'edit own blog entries', 'edit any blog entry');
+  return array('create blog entries', 'edit own blog entries', 'edit any blog entry', 'delete own blog entries', 'delete any blog entry');
 }
 
 /**
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.454.2.2
diff -u -p -r1.454.2.2 book.module
--- modules/book/book.module	13 Feb 2008 11:20:47 -0000	1.454.2.2
+++ modules/book/book.module	11 Apr 2008 22:33:38 -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
diff -u -p -r1.617 comment.module
--- modules/comment/comment.module	25 Jan 2008 16:19:12 -0000	1.617
+++ modules/comment/comment.module	11 Apr 2008 22:34:04 -0000
@@ -271,7 +271,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
diff -u -p -r1.103 contact.module
--- modules/contact/contact.module	16 Jan 2008 12:46:52 -0000	1.103
+++ modules/contact/contact.module	11 Apr 2008 22:34:16 -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/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.448.2.2
diff -u -p -r1.448.2.2 forum.module
--- modules/forum/forum.module	13 Feb 2008 14:06:36 -0000	1.448.2.2
+++ modules/forum/forum.module	11 Apr 2008 22:36:26 -0000
@@ -319,7 +319,7 @@ function forum_access($op, $node, $accou
  * Implementation of hook_perm().
  */
 function forum_perm() {
-  return array('create forum topics', 'delete own forum topics', 'delete any forum topic', 'edit own forum topics', 'edit any forum topic', 'administer forums');
+  return array('administer forums', 'create forum topics', 'edit own forum topics', 'edit any forum topic', 'delete own forum topics', 'delete any forum topic');
 }
 
 /**
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.138
diff -u -p -r1.138 path.module
--- modules/path/path.module	3 Feb 2008 19:20:35 -0000	1.138
+++ modules/path/path.module	11 Apr 2008 22:37:17 -0000
@@ -206,7 +206,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/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.263
diff -u -p -r1.263 poll.module
--- modules/poll/poll.module	15 Jan 2008 07:57:46 -0000	1.263
+++ modules/poll/poll.module	11 Apr 2008 22:38:00 -0000
@@ -54,7 +54,7 @@ function poll_theme() {
  * Implementation of hook_perm().
  */
 function poll_perm() {
-  return array('create poll content', 'delete own poll content', 'delete any poll content', 'edit any poll content', 'edit own poll content', 'vote on polls', 'cancel own vote', 'inspect all votes');
+  return array('create poll content', 'edit own poll content', 'edit any poll content', 'delete own poll content', 'delete any poll content', 'vote on polls', 'cancel own vote', 'inspect all votes');
 }
 
 /**
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.250.2.1
diff -u -p -r1.250.2.1 search.module
--- modules/search/search.module	7 Feb 2008 16:42:03 -0000	1.250.2.1
+++ modules/search/search.module	11 Apr 2008 22:38:28 -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.8
diff -u -p -r1.585.2.8 system.module
--- modules/system/system.module	27 Feb 2008 19:44:44 -0000	1.585.2.8
+++ modules/system/system.module	11 Apr 2008 22:42:27 -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
diff -u -p -r1.18 user.admin.inc
--- modules/user/user.admin.inc	16 Jan 2008 22:54:41 -0000	1.18
+++ modules/user/user.admin.inc	11 Apr 2008 22:32:02 -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));