Merge from trunk

[SVN r52379]
This commit is contained in:
Vladimir Prus 2009-04-14 08:33:45 +00:00
parent 4ac015023c
commit 4a5cf896ed

@ -1 +1 @@
Subproject commit 8f15600081671ec7a08768a783904ffb13c71c4c
Subproject commit 3b8aca5d8bdd5869269bd7b1ebd08a96cfdabc5f