From 18e41db86785ddee31e9515233e3f3f25a3051f7 Mon Sep 17 00:00:00 2001
From: Paul Merrill <napalminc@gmail.com>
Date: Tue, 2 Nov 2010 08:15:35 -0700
Subject: [PATCH] Merge branch 'master', remote branch 'origin'