Merge from trunk

[SVN r61962]
This commit is contained in:
Vladimir Prus 2010-05-14 06:55:15 +00:00
parent 585aba8d02
commit f449122842

@ -1 +1 @@
Subproject commit ab9901f5530beac64373c880635486de12f6e717
Subproject commit cbacc90d8fdc6be7693762e13b20a43d044ee185