Mario de Sousa <msousa@fe.up.pt> [Thu, 03 Jan 2013 18:27:06 +0000] rev 795
merge
Mario de Sousa <msousa@fe.up.pt> [Thu, 03 Jan 2013 18:26:32 +0000] rev 794
Fix divide by 0 bug.
Mario de Sousa <msousa@fe.up.pt> [Thu, 03 Jan 2013 18:23:07 +0000] rev 793
grand merge