Merge from trunk

[SVN r63913]
This commit is contained in:
Vladimir Prus 2010-07-12 07:37:43 +00:00
parent c994d944df
commit d5e5efa825

@ -1 +1 @@
Subproject commit 235c71c2ba4e4cebe86a260ea71cfb4dafa05e32
Subproject commit ae1402cd4493ff3fa0bec1b4e194bfb7581d9982