7acd45c - Some bugfixes (sync with upstream)

Authored and Committed by cassmodiah 14 years ago
file modified
+48 -2