Merge remote branch 'origin/release-4-5-patches'
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Wed, 18 Aug 2010 12:42:23 +0000 (14:42 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Wed, 18 Aug 2010 12:42:23 +0000 (14:42 +0200)

Trivial merge