[SCM] jack-keyboard/master: Merge commit 'upstream/2.6'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.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: fbcd1b0adf9b619b16342206ecd3e5b32e64ebc4
X-Git-Newrev: 5d754455522b6d6353a80ab6c530cbba7521eefa

The following commit has been merged in the master branch:
commit 5d754455522b6d6353a80ab6c530cbba7521eefa
Merge: fbcd1b0adf9b619b16342206ecd3e5b32e64ebc4 045ad8821b4500a2ade096cb5776fbc52f7f6074
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 4 13:28:29 2011 +0200

    Merge commit 'upstream/2.6'


-- 
jack-keyboard packaging