first commit
Merge http://github.com/chlamydomonas/ssa