Amazon's spent much of 2012 beefing up its Prime video catalog, and the company just announced a new partnership with Warner Bros. that will bring a variety of TV shows, including The West Wing and Fringe, to Amazon's video service. As before, those who aren't Amazon Prime subscribers can undergo a free month-long trial, with videos playable on the computer, the Kindle Fire, and a variety of set-top boxes and consoles. Amazon is now touting more than 18,000 movies and TV shows (counting by individual episodes), up from the 17,000 figure the company had been citing in recent months. A new, high-profile content partnership is rather timely for Amazon — rumors are swirling about an updated Kindle Fire, and access to the Amazon Prime video library is one major feature that Google's Nexus 7 can't match.