Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Sat, 26 Oct 2013 16:45:52 +0000 (09:45 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Sat, 26 Oct 2013 16:45:52 +0000 (09:45 -0700)

Trivial merge