Just a quick update on the status of the Apple TV software upgrade: according to Apple's web site, the software is not quite ready and will be available in one to two weeks.
As we covered during MWSF, the Apple TV Take 2 (or as I like to call it, Apple TV Redux) will feature support buying music/movies/rentals directly from Apple TV, HD rentals and the ability to view pictures from a Flickr or .Mac account.
The update is free to existing customers and will presumably be shipping standard on all new Apple TV's as soon as it is complete.
Update: Here is Apple's press release detailing that the MacBook Air is now shipping, and that the Apple TV update will be available 'by the end of February.' Thanks to Ominx for the link.