Revision 25012

Author:	saul.farber
Date:	2007-04-04
Message:	Fixes for http://jira.codehaus.org/browse/GEOT-1202 and http://jira.codehaus.org/browse/GEOT-1220