From d820f27057523df858aedd6de9f0bfbc8e48bcf4 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Mon, 12 Aug 2013 09:05:40 +0000
Subject: [PATCH] Copied trunk to branches/gsoc13.