Merged changes from trunk.

[SVN r62272]
This commit is contained in:
Andrey Semashev 2010-05-27 17:58:58 +00:00
parent 9079837b97
commit 93c538918e

@ -1 +1 @@
Subproject commit 20301b3da4ca4cee5a965a8db89bd1219e88f4e6
Subproject commit c9cf0ab0f56e410f3ae8e0015f3df96c5e190de7