Merged r61231 and r61232 from trunk

[SVN r61233]
This commit is contained in:
Jeremiah Willcock 2010-04-12 21:08:02 +00:00
parent 6f3da6976a
commit 69fcaf21ab

@ -1 +1 @@
Subproject commit ae1242ca4ac5b999d8693bba8f98d552a501a290
Subproject commit ce5aba9799926b11090026a4cc32c7b082c5ae92