From df8611817a4fd042604792ad4533d2dfc85139b2 Mon Sep 17 00:00:00 2001
From: Emanuele Caruso <emanuele.caruso@gmail.com>
Date: Fri, 8 Apr 2011 07:05:16 +0200
Subject: [PATCH] Merge branches 'master' and 'accfix'