[SCM] easytag/master: Merge commit 'upstream/2.1.6+git20110423'

[lucidfox-guest at users.alioth.debian.org]

Imported Upstream version 2.1.6+git20110423
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: abc0ef85bf868b97c36c85e7264c6bc02b295122
X-Git-Newrev: f6a3646ce5d3b1f95114e2fddbb097a6200017cb

The following commit has been merged in the master branch:
commit 5772f9b4545b5bdae64ae75ba273f9802e5820ac
Merge: abc0ef85bf868b97c36c85e7264c6bc02b295122 8b8b7579c80bb4fb2d097994c99cf5851f187e2f
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Mon May 2 18:08:16 2011 +0700

    Merge commit 'upstream/2.1.6+git20110423'


-- 
easytag packaging