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

* remotes/upstream/master:
  bugs #312, #313
  revup

* master: