[SCM] jack-tools/master: Merge commit 'upstream/20101210'

[js at users.alioth.debian.org]

Imported Upstream version 20101210
Imported Upstream version 20100210
Imported Upstream version 20100210
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 77d45686ad918042a6e9d866ff08dec8a94b9c3a
X-Git-Newrev: 4192a9d044da42067fbb97e43b435f1b62d639c3

The following commit has been merged in the master branch:
commit ac981c9a8406e076104c51eb3e944637dd2a3d52
Merge: 56b74c05908d14ffdec9ebbbdf21e6838251b730 41ad72cfb8a0b3a9f031fc8d2195d6180272fa9a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 12 11:41:42 2011 +0100

    Merge commit 'upstream/20101210'


-- 
jack-tools packaging