annotate __init__.py @ 513:66a905508e34

resolved merge conflict
author Yoshua Bengio <bengioy@iro.umontreal.ca>
date Tue, 01 Jun 2010 14:05:02 -0400
parents 29fd19d67026
children
rev   line source