Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Tue, 15 Oct 2013 20:47:27 +0000 (13:47 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Tue, 15 Oct 2013 20:47:27 +0000 (13:47 -0700)

Trivial merge