Merge branch 'hide_icons'
authorNikolay Tischenko <niktischenko@gmail.com>
Thu, 21 Oct 2010 18:41:36 +0000 (01:41 +0700)
committerNikolay Tischenko <niktischenko@gmail.com>
Thu, 21 Oct 2010 18:41:36 +0000 (01:41 +0700)

Trivial merge