[SCM] aj-snapshot/master: Merge commit 'upstream/0.9.5'

[alessio 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: 24f2f70abfac2d3fd93f025694208a6d67dff837
X-Git-Newrev: 3116c11801c3d5aee93db726f8287ace6c139f75

The following commit has been merged in the master branch:
commit 3116c11801c3d5aee93db726f8287ace6c139f75
Merge: 24f2f70abfac2d3fd93f025694208a6d67dff837 90a80dc5f15e5fad191e3edbc9b9347712d52b5c
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 8 11:26:03 2011 +0200

    Merge commit 'upstream/0.9.5'


-- 
aj-snapshot packaging