Merge from trunk

[SVN r52376]
This commit is contained in:
Vladimir Prus 2009-04-14 07:59:30 +00:00
parent 64340ab074
commit 9bd671c633

@ -1 +1 @@
Subproject commit 27092095ddb9f89ea77ac7a2e164cf1f76597d9d
Subproject commit ba69296ed95d3ef32da00eac58749cc3c11ad70a