sync to svn
Merge branch 'master' of https://github.com/mxx/cabra