Merge branch 'release-4-5-patches'
authorSzilard Pall <pszilard@cbr.su.se>
Tue, 3 Aug 2010 11:22:10 +0000 (13:22 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Tue, 3 Aug 2010 11:22:10 +0000 (13:22 +0200)

Trivial merge