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)
commit00cef90b0dbac3a8211e1bbe8dffc22593f8a12d
treedf8666aa989957318d25934e1fd14f502eb13744
parentc09cbacf975f429c7b3f535e5e0ae897499f2e15
parent13376a903b6167f26c04e14bad344374469fef25
Merge from 2.5 rev 20515 through 20647.