Merge branch 'master' into packaging
[pithos] / snf-pithos-lib / pithos / lib / util.py