Merge branch 'master' of robin@congo:dev/ohloh_scm