[SCM] hydrogen/master: Merge commit 'upstream/0.9.6_beta1'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.9.6~beta1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 218555aa5c1fbc1b10248a70442e1fc87f376f3d
X-Git-Newrev: 0b98488375f94589dcf6e56a290f6e7e5875cb62

The following commit has been merged in the master branch:
commit 0b98488375f94589dcf6e56a290f6e7e5875cb62
Merge: 218555aa5c1fbc1b10248a70442e1fc87f376f3d 66502d161c8f40ea9f09b2564ac3cd3d8e700757
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 27 02:05:51 2012 +0100

    Merge commit 'upstream/0.9.6_beta1'
    
    Conflicts:
    	.gitignore


-- 
hydrogen packaging