[SCM] cmus/master: Merge branch 'upstream'

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

Imported Upstream version 2.3.4
Imported Upstream version 2.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0b5e2787c1857d9a3ae753d5d53e59589dc751e6
X-Git-Newrev: 312824630c736423b148109356c01ba248e763f2

The following commit has been merged in the master branch:
commit 8841dc62ce2b85c420d62df2ae369268d9e6474f
Merge: 0b5e2787c1857d9a3ae753d5d53e59589dc751e6 f5668a4191f9c9e760da6e035159c7e25b11e033
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Tue Feb 15 15:02:28 2011 -0500

    Merge branch 'upstream'


-- 
cmus packaging