Conflicts:
	theano/gpuarray/basic_ops.py
	theano/gpuarray/dnn.py
	theano/gpuarray/elemwise.py
	theano/gpuarray/extra_ops.py
	theano/gpuarray/opt.py
	theano/gpuarray/opt_util.py