[SCM] libdrumstick/master: Merge commit 'upstream/0.5.0'

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

Imported Upstream version 0.5.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: 6f5815b5f8f0ebb1322ef94ec2dddce2e36e1bee
X-Git-Newrev: 9ec406d8293bead7b8019824594c2d016dd0ff04

The following commit has been merged in the master branch:
commit 846ebb3b7ab34a7612482309e7037bcb0fd56efc
Merge: 1e8e97ee0ae417ec6f9fc34aacbea39c8bf33f53 f9c06b37528bc3ed9416f9cbc29787fc1f326b61
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Sep 9 13:58:50 2010 +0200

    Merge commit 'upstream/0.5.0'


-- 
libdrumstick packaging