- removed r10454 from the merged revisions, because it was a fix for a
test which itself hasn't been merged

git-svn-id: branches/fixes_2_2@10540 -