[SCM] gmidimonitor/master: Merge commit 'upstream/3.5+20110611.git0ca423b0'

[alessio at users.alioth.debian.org]

Imported Upstream version 3.5+20110611.git0ca423b0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4307a615ee1f3fe550fbbf7d17263cd5a3a2c9d9
X-Git-Newrev: 6206895edeeb06f253deabf5dc72f9d08dd05178

The following commit has been merged in the master branch:
commit 2152ab91c8aa013ae936f40b24448a5fb5fc039f
Merge: 4307a615ee1f3fe550fbbf7d17263cd5a3a2c9d9 1f02c1bb3839824613f90ab3bb79e36d7276a123
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jun 11 12:11:25 2011 +0200

    Merge commit 'upstream/3.5+20110611.git0ca423b0'


-- 
gmidimonitor packaging