[fix] check solver prototxt parsing
Merge pull request #1226 from longjon/check-solver-prototxt

[fix] check solver prototxt parsing
[example] fix data script paths for flickr fine-tuning
[again] accumulate diff
Merge branch 'master' into googlenet
[example] add LeNet to MNIST title, fix paths to be from root
[example] re-title LeNet / MNIST heading too
[docs] update homebrew instructions for boost and boost-python split
[docs] note boost 1.56 an CUDA conflict on OS X
add accuracy layer based on a decision tree decision
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into googlenet
add & change model definitions
add & change model definitions
Merge remote-tracking branch 'origin/googlenet' into googlenet

Conflicts:
	models/new_googlenet/solver.prototxt
	models/new_googlenet/train_val4.prototxt
add transform accuracy layer
add transform accuracy layer
add hierarchy10 model
Merge branch 'googlenet' of http://github.com/zhirongw/caffe into googlenet
Merge remote-tracking branch 'qs/googlenet' into googlenet

Conflicts:
	src/caffe/proto/caffe.proto