jbossas/jboss-as — pull request #2804 by emmartins (2012-08-06 10:14:40+00:00)
Title: JBPAPP-9096 on master branch

cherry-pick wrt https://github.com/emmartins/jboss-as/commit/50d222df20d765148be0aa86efee8a4a85b7ea6e