From 38c0181ae4895849a1d529ff5d62a5b46f447536 Mon Sep 17 00:00:00 2001
From: Paul Merrill <napalminc@gmail.com>
Date: Thu, 4 Nov 2010 07:25:20 -0700
Subject: [PATCH] Merge branch 'sti', remote branch 'origin'