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

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