“We’re unifying your phone number and your Apple ID,” said iOS guru Scott Forstall at WWDC today. “So if someone calls you on your phone number with a FaceTime call, you can answer the call on your iPad or even your Mac. And we’re doing the exact same thing with iMessage.”

I think you need iOS 6 to set it up, but clearly it will work on OS X afterwards.