[SCM] jackmeter/master: Merge commit 'upstream/0.4'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d48274eafd7e6668b0454b7d95f0aaa768951e0a
X-Git-Newrev: f0efb9e4eff9dd0834f0f925dad9874d96f67eb4

The following commit has been merged in the master branch:
commit f0efb9e4eff9dd0834f0f925dad9874d96f67eb4
Merge: d48274eafd7e6668b0454b7d95f0aaa768951e0a 11870e3d49c240ab5011ed059e55e46ae4345c0a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 4 14:02:03 2010 +0100

    Merge commit 'upstream/0.4'


-- 
jackmeter packaging