[SCM] japa/master: Merge commit 'upstream/0.6.0'

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

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

The following commit has been merged in the master branch:
commit 03c76cff433d92b1c8d7c070353f2c502515cae9
Merge: be0be30d5588a67370888b7146a37f365a260336 4938685a963cf98fbe3e2f0a4794bef3debb713f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Feb 21 01:38:16 2011 +0100

    Merge commit 'upstream/0.6.0'


-- 
japa packaging