Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 15876)
+++ wp-includes/user.php	(working copy)
@@ -563,7 +563,6 @@
  * @uses $blog_id The Blog id of the blog for those that use more than one blog
  *
  * @param int $id Blog ID.
- * @param array $args Optional query arguments passed to get_users()
  * @return array List of users that are part of that Blog ID
  */
 function get_users_of_blog( $id = '', $args = array() ) {
@@ -572,8 +571,7 @@
 	if ( empty($id) )
 		$id = (int) $blog_id;
 
-	$args['blog_id'] = $id;
-	return get_users( $args );
+	return get_users( array( 'blog_id' => $id ) );
 }
 
 /**
Index: wp-admin/includes/default-list-tables.php
===================================================================
--- wp-admin/includes/default-list-tables.php	(revision 15876)
+++ wp-admin/includes/default-list-tables.php	(working copy)
@@ -2958,7 +2958,7 @@
 					case 'users': ?>
 						<td valign="top">
 							<?php
-							$blogusers = get_users_of_blog( $blog['blog_id'], array('number' => 6) );
+							$blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
 							if ( is_array( $blogusers ) ) {
 								$blogusers_warning = '';
 								if ( count( $blogusers ) > 5 ) {
Index: wp-admin/network/sites.php
===================================================================
--- wp-admin/network/sites.php	(revision 15876)
+++ wp-admin/network/sites.php	(working copy)
@@ -257,7 +257,7 @@
 				<?php }
 
 				// Site users
-				$blogusers = get_users_of_blog( $id, array('number' => 20) );
+				$blogusers = get_users( array( 'blog_id' => $id, 'number' => 20 ) );
 				if ( is_array( $blogusers ) ) {
 					echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __( 'Site Users' ) . '</span></h3><div class="inside">';
 					echo '<table class="form-table">';