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

[alessio at users.alioth.debian.org]

Imported Upstream version 3.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 512606f78e8fb1283cde9938ab7e1538de69031f
X-Git-Newrev: 31afe84474f5b1c80b5d7a0ac4b35fef359d120d

The following commit has been merged in the master branch:
commit fe337275350df2089c3f84aa1af6e637cc490d9d
Merge: 512606f78e8fb1283cde9938ab7e1538de69031f dd6c9ef1f4455a76bc6a6ae901b424dc11e0c8cb
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 19 20:22:11 2011 +0200

    Merge commit 'upstream/3.5'


-- 
gmidimonitor packaging