From 89df33f0a8f03116a31351fbaa0aed23767bc3ef Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 12 May 2012 15:55:03 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: fix in earthlayers
  diabook-theme: some fixes

* master: