[SCM] oomidi/master: Merge commit 'upstream/0.0+git20110329.1'

[js at users.alioth.debian.org]

Imported Upstream version 0.0+git20110329.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: a7c43c0803c97748b35e6d8b58df9bfa1cba3198
X-Git-Newrev: 29f0a27a84ca4535075b67fa500ecb3c0eb37e6e

The following commit has been merged in the master branch:
commit c4124916a73bcd901e4e63dfbd7039d31f1d5cb4
Merge: a7c43c0803c97748b35e6d8b58df9bfa1cba3198 6088c35ba58efb470dbd1fe9143a292a2625fb80
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Apr 12 19:24:55 2011 +0200

    Merge commit 'upstream/0.0+git20110329.1'


-- 
oom packaging