From 89f74795778b90738a37e199c9d6b9415b0447e4 Mon Sep 17 00:00:00 2001
From: Nathen Harvey <nharvey@customink.com>
Date: Sun, 19 Jun 2011 10:59:19 -0700
Subject: [PATCH] merge upstream