[SCM] hydrogen/master: Merge commit 'upstream/0.9.5'

[js at users.alioth.debian.org]

Imported Upstream version 0.9.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f074f1e8ddf16ee8899b1dd0edc35c49d544ae49
X-Git-Newrev: b5624b03716a7b7008cc00da11079e7079256c52

The following commit has been merged in the master branch:
commit b5624b03716a7b7008cc00da11079e7079256c52
Merge: fab4641ca9e7d6be7e08f726194b4cde6c6e8671 0a55094dc5d01c1a27c6f86e2ae01b143b439747
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 17 21:03:48 2011 +0100

    Merge commit 'upstream/0.9.5'


-- 
hydrogen packaging