From e20f57e80448e192a2c6c154aa8852f212913613 Mon Sep 17 00:00:00 2001
From: Alexander Stigsen <stigsen@e-texteditor.com>
Date: Wed, 12 Jan 2011 11:49:59 +0100
Subject: [PATCH] Merge branch 'master', remote branch 'remotes/tea/master'