Merge remote branch 'origin/release-4-5-patches'
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 17 Aug 2010 15:51:09 +0000 (17:51 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 17 Aug 2010 15:51:09 +0000 (17:51 +0200)

Trivial merge