From 797d5388c47de7cbe11f067b9c29e872db13d730 Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 25 Jun 2011 17:35:59 +0200
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'

-- 
2.47.2