ARCHETYPE-462

Here's a pull request for http://jira.codehaus.org/browse/ARCHETYPE-462