[SCM] bangarang/master: Merge commit 'upstream/2.0'

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

Imported Upstream version 2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4c7997140b921a2152a3a0ba80ac4a397ee848e9
X-Git-Newrev: 42afad5500333bbfa6a44ec2e0055309c8389f58

The following commit has been merged in the master branch:
commit 91f3bbf90d2bfb614fe467d1667d716d58e5b1f4
Merge: 4c7997140b921a2152a3a0ba80ac4a397ee848e9 d4a4ecd07a1c6a0d631b3d4beef54ea62f645016
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Mon Jan 31 20:18:44 2011 -0500

    Merge commit 'upstream/2.0'


-- 
bangarang packaging