Index: wp-includes/capabilities.php
===================================================================
--- wp-includes/capabilities.php	(revision 17501)
+++ wp-includes/capabilities.php	(working copy)
@@ -73,14 +73,11 @@
 	var $use_db = true;
 
 	/**
-	 * PHP4 Constructor - Call {@link WP_Roles::_init()} method.
+	 * Constructor
 	 *
 	 * @since 2.0.0
-	 * @access public
-	 *
-	 * @return WP_Roles
 	 */
-	function WP_Roles() {
+	function __construct() {
 		$this->_init();
 	}
 
@@ -269,7 +266,7 @@
 	var $capabilities;
 
 	/**
-	 * PHP4 Constructor - Set up object properties.
+	 * Constructor - Set up object properties.
 	 *
 	 * The list of capabilities, must have the key as the name of the capability
 	 * and the value a boolean of whether it is granted to the role.
@@ -279,9 +276,8 @@
 	 *
 	 * @param string $role Role name.
 	 * @param array $capabilities List of capabilities.
-	 * @return WP_Role
 	 */
-	function WP_Role( $role, $capabilities ) {
+	function __construct( $role, $capabilities ) {
 		$this->name = $role;
 		$this->capabilities = $capabilities;
 	}