Merge branch 'release-4-5-patches'
authorCarsten Kutzner <ckutzne@gwdg.de>
Tue, 4 Jan 2011 17:31:50 +0000 (18:31 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Tue, 4 Jan 2011 17:31:50 +0000 (18:31 +0100)

Trivial merge