syncronize release with trunk

[SVN r74705]
This commit is contained in:
Robert Ramey 2011-10-04 19:22:28 +00:00
parent c27574e376
commit 6104bd8a37

@ -1 +1 @@
Subproject commit 5d6e366240e531ee368c0d25d3ff5e2b529f56e1
Subproject commit 2d1b4f8721fb6d267aa698f89a9251e1b9401216