Merge branch 'ts'
authorShaverdova Elena <eshaverdova@gmail.com>
Thu, 24 May 2012 15:20:46 +0000 (19:20 +0400)
committerShaverdova Elena <eshaverdova@gmail.com>
Thu, 24 May 2012 15:20:46 +0000 (19:20 +0400)

Trivial merge