Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Thu, 7 Nov 2013 19:29:22 +0000 (11:29 -0800)
committerYangqing Jia <jiayq84@gmail.com>
Thu, 7 Nov 2013 19:29:22 +0000 (11:29 -0800)

Trivial merge