Merge from trunk

[SVN r33840]
This commit is contained in:
Vladimir Prus 2006-04-27 15:19:38 +00:00
parent 54e0eb16a3
commit be77aa6aad

@ -1 +1 @@
Subproject commit d2972b77ee028b56512ecab93eab68c75ead9e53
Subproject commit 0bcd460d0dd1829b8ae5a3d59755e94bcfebcd12