Merged 2.5.
authorChingiz Dyussenov <chingiz.ds@gmail.com>
Sun, 10 May 2009 08:53:47 +0000 (08:53 +0000)
committerChingiz Dyussenov <chingiz.ds@gmail.com>
Sun, 10 May 2009 08:53:47 +0000 (08:53 +0000)

Trivial merge