Merge build fixes from r10 mainintance branch
commit170de50d8f5d638ce84145563b20cb2e7f5626e7
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 12 Jul 2010 13:47:21 +0000 (12 16:47 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 12 Jul 2010 13:47:21 +0000 (12 16:47 +0300)
tree438925e0c4010163c77983399408e6ee8a35be3d
parent19cbdea61eeb0fceda9460453452bd96bd03904a
parent03e7c579668bb573a94f2f39e410efc30140e9d3
Merge build fixes from r10 mainintance branch

Conflicts:
Changelog.utf8
VERSIONINFO
Changelog.utf8