Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 12605)
+++ wp-includes/functions.php	(working copy)
@@ -321,6 +321,12 @@
 function get_option( $setting, $default = false ) {
 	global $wpdb;
 
+	if ( WP_DEBUG && 'home' == $setting && did_action('init') ) {
+		$backtrace = debug_backtrace();
+		if ( 'home_url' != $backtrace[1]['function'] )
+			_deprecated_argument( __FUNCTION__, '3.0', __('Use home_url() instead of get_option(\'home\').') );
+	}
+
 	// Allow plugins to short-circuit options.
 	$pre = apply_filters( 'pre_option_' . $setting, false );
 	if ( false !== $pre )
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 12605)
+++ wp-includes/general-template.php	(working copy)
@@ -297,11 +297,11 @@
 function get_bloginfo( $show = '', $filter = 'raw' ) {
 
 	switch( $show ) {
-		case 'home' : // DEPRECATED
-		case 'siteurl' : // DEPRECATED
-			_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use the \'%2$s\' option instead.'), $show, 'url' ) );
-		case 'url' :
-			$output = home_url();
+		case 'home'    : // DEPRECATED in 2.2
+		case 'siteurl' : // DEPRECATED in 2.2
+		case 'url'     : // DEPRECATED in 3.0
+			_deprecated_argument( __FUNCTION__, '3.0', sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use home_url() instead.'), $show ) );
+			return home_url();
 			break;
 		case 'wpurl' :
 			$output = get_option('siteurl');