From 3c21dfe69fcd73dd2eb5be79ad5b8f0b7d675ff0 Mon Sep 17 00:00:00 2001
From: Peter Veentjer <alarmnmmer@gmail.com>
Date: Wed, 13 Jul 2011 15:37:09 +0300
Subject: [PATCH] Merge branches 'wip-1018' and 'master'