Fix merge problem.
Merge branch 'master' of github.com:kablamo/blog.kablamo.org
Merge branch 'master' of github.com:kablamo/blog.kablamo.org
Link to followup post.