From 668892b7a38547210b8162f9988844c99474b051 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 18:42:00 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master: