From 783c91adffdd6163d20fe400b8810cc523f63218 Mon Sep 17 00:00:00 2001
From: Michael Jensen <emjay1988@gmail.com>
Date: Thu, 30 Sep 2010 10:16:07 +1000
Subject: [PATCH] Merge branches 'documentation' and 'master'