[SCM] morituri/master: Merge commit 'upstream/0.1.2'

[js at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 781a41b8a515a4e00ef4697f8b80108b60b77d4d
Merge: faedca7b9b290a64d09c111bf94b0efbbe25ca92 a3368869a6d92367c6f7ba27c2d0350845878252
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 5 18:35:45 2011 +0200

    Merge commit 'upstream/0.1.2'


-- 
morituri packaging