From 10f6a4306b99c04de65e4639d2fa3d5f9f2a9a62 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Fri, 28 Oct 2011 20:51:28 +0200
Subject: [PATCH] Merge branches 'multi-tag' and 'master'