From 016f046a6a557cae0ceff9d66c00bab8b02941a5 Mon Sep 17 00:00:00 2001
From: Chaitanya Kuber <chaitanya.kuber@bigcommerce.com>
Date: Mon, 19 Mar 2012 07:14:02 +0800
Subject: [PATCH] Merge branch 'master', remote branch 'upstream/master'