Merge branch 'master' into debian-0.9
[pithos] / snf-pithos-tools / debian / clean