From 9d974c988ae871e10165f0ea8e28f7608386f455 Mon Sep 17 00:00:00 2001
From: mikedeboer <info@mikedeboer.nl>
Date: Mon, 20 Sep 2010 10:57:41 +0200
Subject: [PATCH] Merge branch 'master', remote branch 'origin'