From 3774c2cbfd259afb243434eaeec335cb6f28fab1 Mon Sep 17 00:00:00 2001
From: Michael Fields <michael@mfields.org>
Date: Fri, 28 Dec 2012 17:24:51 -0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'