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

[ghedo-guest 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: 4f411e4b88cdebe5145b04fa3e6d81e18706f6a8
X-Git-Newrev: d3e2856d415ff2f0383756faea5acdb8f3354018

The following commit has been merged in the master branch:
commit 99969f78734e2dd23bce563d41266fca08c54d98
Merge: d08ad41cfe3a2373e2a9300b7e1664b78d1e3b4b 50f542fc530880e824b84313f09385cb16a25d2b
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Sun Jan 9 12:33:18 2011 +0100

    Merge commit 'upstream/0.90.85_dfsg'


-- 
milkytracker packaging