Merge git@gitorious.org:pivip/mainline
treefcc6038781846cf875cd4268f579cae0b0ba5fd7
drwxr-xr-x - project
drwxr-xr-x - specifications