Close New Bugs

Close:
Bug #537
Bug #538