Merge branch 'fifteen'
authortanya <tanya@moshkanov.oblgaz>
Thu, 2 Sep 2010 19:51:22 +0000 (22:51 +0300)
committertanya <tanya@moshkanov.oblgaz>
Thu, 2 Sep 2010 19:51:22 +0000 (22:51 +0300)

Trivial merge