Merge branch 'release-4-5-patches' into rotation-4-5
authorCarsten Kutzner <ckutzne@gwdg.de>
Mon, 15 Nov 2010 09:34:52 +0000 (10:34 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Mon, 15 Nov 2010 09:34:52 +0000 (10:34 +0100)

Trivial merge