From 8c52dc53986c64c4f592e06906346dc96088c8fb Mon Sep 17 00:00:00 2001
From: Saebekassebil <saebekassebil@gmail.com>
Date: Sat, 15 Sep 2012 18:44:34 +0200
Subject: [PATCH] Merge branch 'mozilla', remote-tracking branch
 'origin/master' into mozilla