Commit 1a10fded40875f986164b80c6efd414cd1507cb8

Vicent Martí 2012-08-15T14:34:49

Merge pull request #877 from nulltoken/minor-fixes Minor fixes