From 928fa9c4de4ceb2837e93b30ed5d00ac91a0ccdd Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Tue, 26 Jul 2011 09:07:04 +0400
Subject: [PATCH] Created branch 'merge'