Merge some fixes from r10 maint branch
commit66996e68209497d4b68e804500f1b64801465b65
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 31 Jul 2010 10:25:29 +0000 (31 13:25 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 31 Jul 2010 10:25:29 +0000 (31 13:25 +0300)
treeb589b21f90e2b480e8c52de6970230fb6f861c66
parent196b3b7352ea5d6c05541a69847746966079f48a
parenta2d3c47b9bdd6e8a4be1ecfec96779b970216620
Merge some fixes from r10 maint branch

Conflicts:
Changelog.utf8
VERSIONINFO
Changelog.utf8