From ca00e0de33deb2743a967bc8028a8f78f948fe6d Mon Sep 17 00:00:00 2001
From: Lowe Schmidt <lowe.schmidt@gmail.com>
Date: Mon, 6 Jun 2011 13:38:50 +0200
Subject: [PATCH] Merge branches 'frost-theme' and 'master'