From 19536e1fc7efaa80e92a1be85c1e2b866a8597c5 Mon Sep 17 00:00:00 2001
From: Anup Patel <anup@brainfault.org>
Date: Wed, 20 Jul 2011 09:28:05 +0530
Subject: [PATCH] Merge branch 'master', remote branch 'upstream/master'