# HG changeset patch
# User James Bergstra <bergstrj@iro.umontreal.ca>
# Date 1271343122 14400
# Node ID e0b960ee57f5debae0f1b4860c65eea76d268006
# Parent  ca9fc8cae5b5d25154a39cb17ae3dd2eb0029757# Parent  1c62fa857cab88e4aeb89ec30a52bc24646a182d
merge

diff -r ca9fc8cae5b5 -r e0b960ee57f5 pylearn/dataset_ops/protocol.py