From 1d87f246da418a780ed5662ad10c2beab0f627b5 Mon Sep 17 00:00:00 2001
From: Michael Fields <michael@mfields.org>
Date: Fri, 28 Dec 2012 16:57:26 -0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'