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

[js at users.alioth.debian.org]

Imported Upstream version 0.0+git20110203.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: 38d41de43b450b89a926206ee111d4dc5600bbce
X-Git-Newrev: 26abaf212f82544c1268cbaa5254107633a57149

The following commit has been merged in the master branch:
commit f4f12ebd0785b2fe3ec42e5e608f185fa1eb2595
Merge: 2d7e777b35f90807e133a9ef46aac6fc27a5e36b b3ed06d7b82b60cfcdadf7cee84ca1aeb6c1a4ff
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Feb 3 17:50:36 2011 +0100

    Merge commit 'upstream/0.0+git20110203.1'


-- 
oom packaging