Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 6301)
+++ wp-includes/pluggable.php	(working copy)
@@ -292,8 +292,8 @@
 	$login = get_userdatabylogin($username);
 	//$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
 
-	if (!$login) {
-		$error = __('<strong>ERROR</strong>: Invalid username.');
+	if ( !$login ) {
+		$error = __('<strong>ERROR</strong>: Incorrect username or password.');
 		return false;
 	} else {
 		// If the password is already_md5, it has been double hashed.
@@ -301,7 +301,7 @@
 		if ( ($already_md5 && md5($login->user_pass) == $password) || ($login->user_login == $username && $login->user_pass == md5($password)) ) {
 			return true;
 		} else {
-			$error = __('<strong>ERROR</strong>: Incorrect password.');
+			$error = __('<strong>ERROR</strong>: Incorrect username or password.');
 			$pwd = '';
 			return false;
 		}