From fb50727f8d15da3f1ae67b5c2594d3c31b560842 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 23 May 2012 18:04:23 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master: