Whoops, forgot to save the last example
Merge branch 'master' of git://github.com/geoserver/geoserver