From 16aa591e3bfad602724b94f86b2f5e9bfb3704e7 Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Wed, 13 Apr 2011 23:00:05 +0200
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'