Merge branch 'master' of git://github.com/dmorse/simpatico
Merge branch 'master' of ssh://github.com/medapuram/simpatico