Merge branch 'gilbert' into gilbert-1.3
[philo.git] / contrib / waldo / __init__.py