Merge branch 'master' into ticket21
authorVyacheslav Tyutyunkov <tyutyunkov@gmail.com>
Fri, 29 Mar 2013 10:03:04 +0000 (17:03 +0700)
committerVyacheslav Tyutyunkov <tyutyunkov@gmail.com>
Fri, 29 Mar 2013 10:03:04 +0000 (17:03 +0700)

Trivial merge