Cherry pick r86 from bug720816

This commit is contained in:
jaypipes@gmail.com 2011-03-16 12:34:04 -04:00
parent 7d51420e89
commit 385341a94e