Merge branch 'development' of ssh://sjosi@puppet.puzzle.ch//srv/puppet/modules-develo...
authorSimon Josi <josi@puzzle.ch>
Thu, 16 Oct 2008 17:31:43 +0000 (19:31 +0200)
committerSimon Josi <josi@puzzle.ch>
Thu, 16 Oct 2008 17:31:43 +0000 (19:31 +0200)

Trivial merge