From b7dd5fc97a8efa1e45302ffb1a853903c5d642a4 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 11 Aug 2008 02:30:41 +0000
Subject: [PATCH] (blocked bidirectional merge from trunk into branches/roa)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60319 467b73ca-7a2a-4603-9d3b-597d59a354a9