From b584b263234515a1059c8b5541bbfed9bc4bfcba Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 8 Mar 2012 15:30:47 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master: