Merge fixes in r10 maint branch
commit1a40db85db79d49e4c5b44c9decb02ca5a28f7dc
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 26 Aug 2010 12:09:42 +0000 (26 15:09 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 26 Aug 2010 12:09:42 +0000 (26 15:09 +0300)
tree9efdd1f3e24d1168bcc6446427d01a7f9a78aa6c
parentb010ed731cc23221d65530a3fb337e9719bf8423
parent17a731bb19c9e217cb79758d77a5d31e641d1631
Merge fixes in r10 maint branch

Conflicts:
Changelog.utf8
Changelog.utf8