[SCM] milkytracker/master: Merge commit 'upstream/0.90.85_dfsg'

[js at users.alioth.debian.org]

Imported Upstream version 0.90.85~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d98e58c47e289bc2ab5ab27adb2ce3d7ba365342
X-Git-Newrev: bfcffaa254566f9da3e18337e1cd4e10964436fd

The following commit has been merged in the master branch:
commit a92613f2279e7d7c9e8ef301f3f039ba4a22ee37
Merge: f482cb9ce84e1376c632e9d48ec401479a3af16c 15db1f6db034a28b02ce762ca62759a2c2005b31
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 1 03:41:14 2011 +0100

    Merge commit 'upstream/0.90.85_dfsg'


-- 
milkytracker packaging