[SCM] oomidi/master: Merge commit 'upstream/0.2011.3.1'

[js at users.alioth.debian.org]

Imported Upstream version 0.2011.3.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: 7b36a374f61a4398f5e2073bd2b87a1bb40ae361
X-Git-Newrev: 3c111a91c7b3dbc0a2ee00043a247ec992d1dae8

The following commit has been merged in the master branch:
commit 4e19a6935ee2378733086b1bb24f70f3dde45e48
Merge: 7b36a374f61a4398f5e2073bd2b87a1bb40ae361 e594704f9234013d4072304af227016b37fcb42b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Oct 9 12:12:20 2011 +0200

    Merge commit 'upstream/0.2011.3.1'


-- 
oom packaging