Update for 2012-02-27

Benjamin Mako Hill || Want to submit a patch?