merge from 1.4.x + test

Author: jrthomerson
Date: Fri Aug  6 19:51:26 2010
New Revision: 983111

URL: http://svn.apache.org/viewvc?rev=983111&view=rev
Log:
fixes WICKET-2974



git-svn-id: https://svn.apache.org/repos/asf/wicket/trunk@983186 13f79535-47bb-0310-9956-ffa450edef68
8 files changed