Merged changes from trunk.

[SVN r85804]
This commit is contained in:
Andrey Semashev 2013-09-20 17:40:42 +00:00
parent 7a2ea8de0b
commit ca11b5baa9

@ -1 +1 @@
Subproject commit ca23b6f4f8829200d133c79e6ee0a19544ed8b2e
Subproject commit 8b89b5ba279dbab5056e04ff0e6754d22c8cfba7