revert merge properties to something sane

This commit is contained in:
Benjamin Peterson 2009-05-02 20:14:55 +00:00
parent aef3fb082c
commit 65b42a1e8f

Diff Content Not Available