[SCM] smplayer-themes/master: Merge tag 'upstream/20120131'

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

Imported Upstream version 20120131
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cd7e85e98b3a72d41c7238784322bf92bd781472
X-Git-Newrev: 1db0bf99b92db462ccb3b643e4207c29e7071997

The following commit has been merged in the master branch:
commit 9a805c0bc4585081b6d5c14e228de40e9db14068
Merge: cd7e85e98b3a72d41c7238784322bf92bd781472 edc18ea83be7afa4e2e68dd0a739347120ef1283
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Wed May 9 10:30:15 2012 +0700

    Merge tag 'upstream/20120131'
    
    Upstream version 20120131


-- 
smplayer-themes packaging