Merge branch 'main' of file:///home/somebody/projects/someplayer into main
authorNikolay Tischenko <niktischenko@gmail.com>
Sat, 11 Sep 2010 13:13:46 +0000 (20:13 +0700)
committerNikolay Tischenko <niktischenko@gmail.com>
Sat, 11 Sep 2010 13:13:46 +0000 (20:13 +0700)

Trivial merge