Merge branch 'slideshow'
authortanya <tanya@moshkanov.oblgaz>
Sat, 2 Oct 2010 21:16:26 +0000 (00:16 +0300)
committertanya <tanya@moshkanov.oblgaz>
Sat, 2 Oct 2010 21:16:26 +0000 (00:16 +0300)

Trivial merge