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