Merged r53751, r41955, r47793, r47794, r47797, r62595 from trunk; fixes #865

[SVN r62596]
This commit is contained in:
Jeremiah Willcock 2010-06-08 19:31:13 +00:00
parent adc18dde42
commit 10ddf24bc5

@ -1 +1 @@
Subproject commit def441d02daf62d4fb14b8acef175bde4e637fc6
Subproject commit 570d5a6f92d7b44fd75c1bc554fa49e5a7eee309