From f364aa8fb0af943a4be3a8a990126eea0cfa247d Mon Sep 17 00:00:00 2001
From: Matthew Wrather <matt@wrathercreative.com>
Date: Fri, 25 Nov 2011 23:30:32 -0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'