Merge branch 'symbian-port'
authorIvan Maidanski <ivmai@mail.ru>
Tue, 20 Mar 2012 18:42:40 +0000 (22:42 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Tue, 20 Mar 2012 18:42:40 +0000 (22:42 +0400)

Trivial merge