Index: branches/2.7/wp-includes/functions.php
===================================================================
--- branches/2.7/wp-includes/functions.php	(revision 10220)
+++ branches/2.7/wp-includes/functions.php	(working copy)
@@ -94,7 +94,7 @@
 			return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * 3600 ) ) );
 			break;
 		case 'timestamp':
-			return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * 3600 );
+			return ( $gmt ) ? strtotime(gmdate("Y-m-d H:i:s")) : strtotime(gmdate("Y-m-d H:i:s")) + ( get_option( 'gmt_offset' ) * 3600 );
 			break;
 	}
 }
Index: trunk/wp-includes/functions.php
===================================================================
--- trunk/wp-includes/functions.php	(revision 10220)
+++ trunk/wp-includes/functions.php	(working copy)
@@ -94,7 +94,7 @@
 			return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * 3600 ) ) );
 			break;
 		case 'timestamp':
-			return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * 3600 );
+			return ( $gmt ) ? strtotime(gmdate("Y-m-d H:i:s")) : strtotime(gmdate("Y-m-d H:i:s")) + ( get_option( 'gmt_offset' ) * 3600 );
 			break;
 	}
 }