Comment D-Link Boxbee (Score 1) 516
I'm holding out for a D-Link Boxbee. It is small, dedicated hardware which supports both online streaming from netflix, hulu and such as well as full support for your local library of video/audio. Should be out this fall.
I'd provide links, but it's easier to just google for it.