Merge from trunk

[SVN r57547]
This commit is contained in:
Vladimir Prus 2009-11-10 17:54:32 +00:00
parent 23ad40fba6
commit c18c11bd86

@ -1 +1 @@
Subproject commit 189aa3247de8da890556180691f5d762a012b197
Subproject commit e5f8e9549142a06f502afa0cec4f523a3a392544