[SCM] gmidimonitor/master: Merge commit 'upstream/3.6+dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 3.6+dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c9866e2d23f2cae801d2dafb2990e664315c2046
X-Git-Newrev: 1af5c0683f5cad611237ee3205a119b76f232516

The following commit has been merged in the master branch:
commit 481ae6f1432c0867e44443ebd097800cc01570af
Merge: c9866e2d23f2cae801d2dafb2990e664315c2046 80b1c6cfdcb3716e9f431e68a742f28493dd9778
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 9 16:30:49 2012 +0100

    Merge commit 'upstream/3.6+dfsg0'


-- 
gmidimonitor packaging