Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@mail.ru>
Sat, 14 May 2011 22:55:31 +0000 (00:55 +0200)
committerthe_mgt <themgt@mail.ru>
Sat, 14 May 2011 22:55:31 +0000 (00:55 +0200)

Trivial merge