Merge branch 'release-4-5-patches'
authorCarsten Kutzner <ckutzne@gwdg.de>
Thu, 2 Dec 2010 14:46:46 +0000 (15:46 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Thu, 2 Dec 2010 14:46:46 +0000 (15:46 +0100)

Trivial merge