Merge branch 'master' into eterhack
authorVitaly Lipatov <lav@etersoft.ru>
Fri, 2 May 2008 17:30:27 +0000 (21:30 +0400)
committerVitaly Lipatov <lav@etersoft.ru>
Fri, 2 May 2008 17:30:27 +0000 (21:30 +0400)
Conflicts:

VERSION


Trivial merge