zo-marshal patch from Jay
zo-marshal patch from Jay

svn: r14642

original commit: b42f1b5d8bd8b7d9a15f7a0db6a5dcf73f4caac9

mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket,mafagafogigante/racket