Merge branch 'master' into debian-0.9
[pithos] / docs /
drwxr-xr-x   ..
drwxr-xr-x - build
drwxr-xr-x - source