Merge branch 'dirview'
authorNikolay Tischenko <niktischenko@gmail.com>
Sun, 31 Oct 2010 11:36:27 +0000 (17:36 +0600)
committerNikolay Tischenko <niktischenko@gmail.com>
Sun, 31 Oct 2010 11:36:27 +0000 (17:36 +0600)

Trivial merge