merged with trunk

git-svn-id: http://svn.miranda-ng.org/main/branches/unsane@5109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c