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)
commitf18190cf692d9638674a06a3bd5fa551d5b96f53
treee7d53ac1b2cc29905dc853210476564e5c05ca0a
parentd35f766fa434531a5b59a866d362035e89ca8b51
parentacb4d581205790da90deeba5e7afac34f8c73107
Merged 2.5.