Merge from trunk.

[SVN r78362]
This commit is contained in:
Vladimir Prus 2012-05-06 18:13:25 +00:00
parent 27834bcf50
commit f5a97a491e

@ -1 +1 @@
Subproject commit 63e8f1c954e30efc30330386e0bfff577d183117
Subproject commit f271e1ffce5a84942d4ee69fe1d861fd10c2658c