From e2c65d72aebdedf5439f84833db9fcb63a81dd2b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Nov 2011 11:56:02 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'