From c1abca091a3a86f75a1b7e825f889b31a2b5c751 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Tue, 3 Aug 2010 14:04:03 +0300
Subject: [PATCH] Merge branches 'master' and 'dev'