hornetq/hornetq — pull request #1542 by scop (2014-02-15 13:18:39+00:00)
Title: Merge throws on previous line to appease both checkstyle 5.6 and 5.7

See pull request #1538 for discussion.