Replace content on master with content from catalyst_2
authorSebastian Pipping <sebastian@pipping.org>
Mon, 2 Jul 2012 14:48:44 +0000 (16:48 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 2 Jul 2012 14:48:44 +0000 (16:48 +0200)

Trivial merge