Fixed on 1.6.x and trunk
Integrated in geoserver-trunk #357 (See http://gridlock.openplans.org:8080/hudson/job/geoserver-trunk/357/)
Integrated in geoserver-1.6.x #81 (See http://gridlock.openplans.org:8080/hudson/job/geoserver-1.6.x/81/)
Fixed on 1.6.x and trunk