Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Fri, 25 Oct 2013 03:44:09 +0000 (20:44 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Fri, 25 Oct 2013 03:44:09 +0000 (20:44 -0700)

Trivial merge