Merge changeset 347 from PyYAML
2 files changed