From 933fe8140abe17bef6ca81eb10e6d4df8395d457 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