From d7042ab828c487420371a6ac12e32359e9e204fa Mon Sep 17 00:00:00 2001
From: comfortablynumb <comfortablynumb84@gmail.com>
Date: Fri, 16 Dec 2011 20:01:10 -0300
Subject: [PATCH] Merge branch 'master', remote branch 'upstream/master'