marschall/punch — pull request #3 by ferstl (2013-01-15 20:57:29+00:00)
Title: Multimodule cleanup

some cleanup after the multimodule refactoring