http://www.synology.com/enu/products/DS210j/index.php
Another NAS option that I read a review on that looks very attractive.. only the disk throughput makes me hesitate (it's good, just not that much better than what I've got already). The DS210+ is a lot better but also twice as much.
But they have almost every feature you could imagine, even iPhone/iPad apps to stream media to your devices!