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

[alessio at users.alioth.debian.org]

Imported Upstream version 3.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: 6206895edeeb06f253deabf5dc72f9d08dd05178
X-Git-Newrev: f8c77cfa2e9fd86fc92c54f8dfc7b0b28bd995ba

The following commit has been merged in the master branch:
commit f8c77cfa2e9fd86fc92c54f8dfc7b0b28bd995ba
Merge: 6206895edeeb06f253deabf5dc72f9d08dd05178 7af02d2a5d85280211341243c3ec72538816bf7f
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jun 16 13:44:23 2011 +0200

    Merge commit 'upstream/3.6'


-- 
gmidimonitor packaging