[SCM] jkmeter/master: Merge commit 'upstream/0.6.1'

[mira-guest at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit f4a465867d9e05248751eb1df8a4c6a8b9d9bbbc
Merge: ed15c09c3eb29461aaed4d33696dd0aa801ef7b0 a4deefc25bb8cea25e45ccbd714c781f7255e217
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Aug 3 02:37:02 2011 +0200

    Merge commit 'upstream/0.6.1'


-- 
jkmeter packaging