Merge branch 'master' into penfield, cleaned up.
[philo.git] / contrib / __init__.py