[SCM] gmusicbrowser/master: Merge commit 'upstream/1.1.6'

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

Imported Upstream version 1.1.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9f9988ed6b811f706c6374a87a848df21e9f6a0d
X-Git-Newrev: f1af26a393c18ada57d2e311ad6d30cb87e96594

The following commit has been merged in the master branch:
commit b3c5acd86a31875a691d7a27467a7c2183685638
Merge: 9f9988ed6b811f706c6374a87a848df21e9f6a0d 9ae7db86352b80381ca6af9a792eaaa9713fc73c
Author: Micah Gersten <micahg at ubuntu.com>
Date:   Tue Feb 22 05:25:13 2011 -0600

    Merge commit 'upstream/1.1.6'


-- 
gmusicbrowser packaging