Merge branch 'master' of github.com:Yangqing/caffe

Conflicts:
	Makefile

diff --cc Makefile
index c7d23f6,3eaaddd..d7ec582
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -42,10 -42,11 +42,11 @@@ MKL_LIB_DIR := $(MKL_DIR)/lib $(MKL_DIR
  # define inclue and libaries
  # We put src here just for gtest
  INCLUDE_DIRS := ./src ./include /usr/local/include $(CUDA_INCLUDE_DIR) \
 -      $(MKL_INCLUDE_DIR) /usr/include/python2.7
 +      $(MKL_INCLUDE_DIR)
  LIBRARY_DIRS := /usr/lib /usr/local/lib $(CUDA_LIB_DIR) $(MKL_LIB_DIR)
  LIBRARIES := cuda cudart cublas curand protobuf opencv_core opencv_highgui \
-       glog mkl_rt mkl_intel_thread leveldb snappy pthread boost_system
+       glog mkl_rt mkl_intel_thread leveldb snappy pthread boost_system \
 -      python2.7 boost_python opencv_imgproc
++      opencv_imgproc
  WARNINGS := -Wall
  
  COMMON_FLAGS := -DNDEBUG $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))