Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Thu, 24 Oct 2013 17:40:02 +0000 (10:40 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Thu, 24 Oct 2013 17:40:02 +0000 (10:40 -0700)

Trivial merge