Merge bug fixes from 2.0 maintenance branch

This commit is contained in:
Ray Speth 2012-07-10 16:28:00 +00:00
commit 0d25383591

Diff content is not available