Merge from 2.5 rev 20515 through 20647.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 5 Jun 2009 14:06:29 +0000 (14:06 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 5 Jun 2009 14:06:29 +0000 (14:06 +0000)

Trivial merge