From 42fe2b2b2d19d09241bd7c3dd811463e0095d4aa Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 11 Jun 2011 10:10:01 +0200
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'

-- 
2.47.3