Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Wed, 30 Oct 2013 18:20:51 +0000 (11:20 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Wed, 30 Oct 2013 18:20:51 +0000 (11:20 -0700)

Trivial merge