Reviewed-by: hawtin
Reviewed-by: vinnie
Summary: Fixed a deadlock between the two class loaders Reviewed-by: alanb
