Merge from trunk

[SVN r61419]
This commit is contained in:
Vladimir Prus 2010-04-20 12:05:14 +00:00
parent 1aa9cf8a9d
commit 69e2ea080f

@ -1 +1 @@
Subproject commit 8f96a92ad8b72695af23c0d5332e664483ae14b8
Subproject commit ff8372431fea633021bbe72d07cc0695b08352b7