Index: wp-includes/capabilities.php
===================================================================
--- wp-includes/capabilities.php	(revision 14085)
+++ wp-includes/capabilities.php	(working copy)
@@ -299,9 +299,6 @@
 	function add_cap( $cap, $grant = true ) {
 		global $wp_roles;
 
-		if ( ! isset( $wp_roles ) )
-			$wp_roles = new WP_Roles();
-
 		$this->capabilities[$cap] = $grant;
 		$wp_roles->add_cap( $this->name, $cap, $grant );
 	}
@@ -322,9 +319,6 @@
 	function remove_cap( $cap ) {
 		global $wp_roles;
 
-		if ( ! isset( $wp_roles ) )
-			$wp_roles = new WP_Roles();
-
 		unset( $this->capabilities[$cap] );
 		$wp_roles->remove_cap( $this->name, $cap );
 	}
@@ -539,10 +533,7 @@
 	function get_role_caps() {
 		global $wp_roles;
 
-		if ( ! isset( $wp_roles ) )
-			$wp_roles = new WP_Roles();
-
-		//Filter out caps that are not role names and assign to $this->roles
+		// Filter out caps that are not role names and assign to $this->roles
 		if ( is_array( $this->caps ) )
 			$this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
 
@@ -1109,9 +1100,6 @@
 function get_role( $role ) {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) )
-		$wp_roles = new WP_Roles();
-
 	return $wp_roles->get_role( $role );
 }
 
@@ -1129,9 +1117,6 @@
 function add_role( $role, $display_name, $capabilities = array() ) {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) )
-		$wp_roles = new WP_Roles();
-
 	return $wp_roles->add_role( $role, $display_name, $capabilities );
 }
 
@@ -1147,9 +1132,6 @@
 function remove_role( $role ) {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) )
-		$wp_roles = new WP_Roles();
-
 	return $wp_roles->remove_role( $role );
 }
 
Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 14085)
+++ wp-settings.php	(working copy)
@@ -234,6 +234,13 @@
 $wp =& new WP();
 
 /**
+ * WordPress Roles Object
+ * @global object $wp_roles
+ * @since 2.0.0
+ */
+$wp_roles =& new WP_Roles();
+
+/**
  * WordPress Widget Factory Object
  * @global object $wp_widget_factory
  * @since 2.8.0