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

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