Merge branch 'master' of github.com:Yangqing/caffe
authorYangqing Jia <jiayq84@gmail.com>
Wed, 25 Sep 2013 22:39:38 +0000 (15:39 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Wed, 25 Sep 2013 22:39:38 +0000 (15:39 -0700)

Trivial merge